forked from Dolibarr/dolibarr
-
Notifications
You must be signed in to change notification settings - Fork 0
Option propagate to variants + v18 UPDATES #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
daxid
wants to merge
495
commits into
epi-18
Choose a base branch
from
option-propagate-to-variants
base: epi-18
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ersion to '0' when used in arithmetic operations) (Dolibarr#29451)
* note_private and note_public was forgotten * sql error missing comma * sql error missing comma for rang=
…: PHP Fatal error: Uncaught Error: Call to undefined function show_addresses() in htdocs/societe/card.php:3325 (Dolibarr#29461)
…29496) * FIX: Hierarchy Employee list do not filters on employee = 1 * Update hierarchy.php --------- Co-authored-by: Laurent Destailleur <[email protected]>
This reverts commit 35aa10a.
* FIX incorrect page numbering in PDF Dolibarr#29458 * Work on width correction * Work on width correction * Work on width correction * Work on code order
…ORDER_CLOSE, the invoice must have the default bank account of the thirdparty is it's empty on order (Dolibarr#29462) * fix: when invoice is created by WORKFLOW_ORDER_AUTOCREATE_INVOICE on ORDER_CLOSE, the invoice must have the default bank account of the thirdparty is it's empty on order * fix: add control on back stattement
* rename const WORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE to WORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE * edit wrong SQL erquest
* show preview pdf list expensereport * conditions added
…up * nb user * nb perms (*nb entities)) instead of count of group (Dolibarr#31687) * fix: group list count nb group * nb user * nb perms * fix: synk.io security issue with zappier sample package in version Dolibarr 18.0
…8 ($remise_percent is '' instead of 0) (Dolibarr#31713)
* FIX Dolibarr#25853 Thirdparty Massaction * FIX Dolibarr#25704 Taxes Deleted from Vendor Invoices * FIX Dolibarr#25704 Taxes Deleted from Vendor Invoices * FIX Dolibarr#25704 Taxes Deleted from Vendor Invoices * Update fournisseur.facture.class.php --------- Co-authored-by: Juanjo Menent <[email protected]> Co-authored-by: Laurent Destailleur <[email protected]>
* fix trim null value on invoice creation * fix trim with null value for note_public
…olibarr#28162) (Dolibarr#31693) In create and update methods of societe class, the trim function triggered warnings when the argument passed is null. Cast string properties to string to avoid php warnings when the property is null. Co-authored-by: UltraViolet33 <[email protected]>
* undef var * add main extrafields on object * remove dev debug sorry ! --------- Co-authored-by: Laurent Destailleur <[email protected]>
Member
Author
|
@dbeniamine quel est le status pour ce merge ? Je crois que la Prod EPI a été mise à jour, mais je ne sais pas comment.. La branche epi-18 doit refléter ce qui est effectivement en prod sinon on court à la catastrophe. |
Member
|
C'est uniquement en pré-prod et la pré-prod est bien sur |
EnjoyFelix
pushed a commit
that referenced
this pull request
Feb 27, 2025
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in the
following fatal error:
GROUP BY fk_facture_fourn
33 DoliDBPgsql::query SQL Error message: ERROR: 42601: syntax error at or near ")"
LINE 10: AND fk_facture_fourn IN ()
^
We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.
It also fixes the following error on the development PHP output.
Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1
($result) must be of type PgSql\Result, bool given in
/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
/var/www/html/accountancy/journal/purchasesjournal.php(418):
DoliDBPgsql->num_rows(false) #2 {main} thrown in
/var/www/html/core/db/pgsql.class.php on line 654
Fixes Dolibarr#32374
EnjoyFelix
pushed a commit
that referenced
this pull request
Feb 27, 2025
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in
fatal errors.
We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.
It also fixes the following error on the development PHP output:
Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1 ($result)
must be of type PgSql\Result, bool given in
/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
/var/www/html/accountancy/journal/expensereportsjournal.php(264):
DoliDBPgsql->num_rows(false) #2 {main} thrown in
/var/www/html/core/db/pgsql.class.php on line 654
Refs Dolibarr#32374 but for the expensereportsjournal page.
EnjoyFelix
pushed a commit
that referenced
this pull request
Feb 27, 2025
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in the
following fatal error:
GROUP BY fk_facture_fourn
33 DoliDBPgsql::query SQL Error message: ERROR: 42601: syntax error at or near ")"
LINE 10: AND fk_facture_fourn IN ()
^
We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.
It also fixes the following error on the development PHP output.
Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1
($result) must be of type PgSql\Result, bool given in
/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
/var/www/html/accountancy/journal/purchasesjournal.php(418):
DoliDBPgsql->num_rows(false) #2 {main} thrown in
/var/www/html/core/db/pgsql.class.php on line 654
Fixes Dolibarr#32374
EnjoyFelix
pushed a commit
that referenced
this pull request
Feb 27, 2025
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in
fatal errors.
We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.
It also fixes the following error on the development PHP output:
Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1 ($result)
must be of type PgSql\Result, bool given in
/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
/var/www/html/accountancy/journal/expensereportsjournal.php(264):
DoliDBPgsql->num_rows(false) #2 {main} thrown in
/var/www/html/core/db/pgsql.class.php on line 654
Refs Dolibarr#32374 but for the expensereportsjournal page.
EnjoyFelix
pushed a commit
that referenced
this pull request
Feb 27, 2025
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in the
following fatal error:
GROUP BY fk_facture_fourn
33 DoliDBPgsql::query SQL Error message: ERROR: 42601: syntax error at or near ")"
LINE 10: AND fk_facture_fourn IN ()
^
We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.
It also fixes the following error on the development PHP output.
Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1
($result) must be of type PgSql\Result, bool given in
/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
/var/www/html/accountancy/journal/purchasesjournal.php(418):
DoliDBPgsql->num_rows(false) #2 {main} thrown in
/var/www/html/core/db/pgsql.class.php on line 654
Fixes Dolibarr#32374
EnjoyFelix
pushed a commit
that referenced
this pull request
Feb 27, 2025
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in
fatal errors.
We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.
It also fixes the following error on the development PHP output:
Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1 ($result)
must be of type PgSql\Result, bool given in
/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
/var/www/html/accountancy/journal/expensereportsjournal.php(264):
DoliDBPgsql->num_rows(false) #2 {main} thrown in
/var/www/html/core/db/pgsql.class.php on line 654
Refs Dolibarr#32374 but for the expensereportsjournal page.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix https://gitlab.tetras-libre.fr/dolibarr/clients/epi-de-savoie/modules-dolibarr/propagate-to-product-combinations/-/merge_requests/1#note_22255
Le module de propagation de variantes (https://gitlab.tetras-libre.fr/dolibarr/clients/epi-de-savoie/modules-dolibarr/propagate-to-product-combinations) a besoin de modification de Doli core.
Pour déployer ce module, il faut répercuter ces changements dans la branche epi-18
Beaucoup de màj de doli arrivent aussi avec cette MR. Veut-on vraiment ça ?
Après la MR, il faut déployer sur la preprod EPI.