Commit Graph

1938 Commits

Author SHA1 Message Date
ptibogxiv
1044e79aa1
fix php 8 error 2022-10-15 13:19:55 +02:00
Laurent Destailleur
3fb7e1252d
Merge pull request #22496 from FHenry/dev_fix_new_InvoiceRemindersEmailToInvoiceContact
new: on CronJob, sendEmailsRemindersOnInvoiceDueDate use billing contact email if exists
2022-10-13 10:29:38 +02:00
Laurent Destailleur
eb0f898b01 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-13 01:10:31 +02:00
Laurent Destailleur
020d3dcbe5 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 12:14:04 +02:00
Florian HENRY
26a1825411 review 2022-10-10 15:54:03 +02:00
Florian HENRY
fea1b2ef14 review 2022-10-10 15:00:51 +02:00
Florian HENRY
a780829a1b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_new_InvoiceRemindersEmailToInvoiceContact 2022-10-10 14:11:17 +02:00
Florian HENRY
a8dd29de85 review 2022-10-10 14:10:02 +02:00
Florian HENRY
9f8a09b4c8 Merge branch '15.0' of github.com:Dolibarr/dolibarr into 15_fix_bad_error_message_CronJobSendEmailsRemindersOnInvoiceDueDate 2022-10-10 14:08:55 +02:00
Laurent Destailleur
b051da4b04 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-07 22:50:58 +02:00
Laurent Destailleur
73c1efecaf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-07 22:47:36 +02:00
Laurent Destailleur
035448c66e Fix log cleaner 2022-10-07 21:36:30 +02:00
Florian HENRY
27236fe853 fix: display correct id of thirdparty 2022-10-06 10:36:11 +02:00
Florian HENRY
664ba283bc fix/feat: on CronJob sendEmailsRemindersOnInvoiceDueDate use billing contact email if exists 2022-10-06 09:49:17 +02:00
Alexandre SPANGARO
5fc79979bc Use isModEnabled 2022-09-25 06:02:13 +02:00
Philippe GRAND
76858ed605 update code toward php8 compliance 2022-09-24 14:39:07 +02:00
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Laurent Destailleur
780b627b55 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-23 18:43:45 +02:00
lmarcouiller
b0d2aa6d9b Fix : php 8.1 warnings 2022-09-23 16:05:11 +02:00
Laurent Destailleur
e1b5e5033f Clean code of deprecated field 2022-09-23 09:35:17 +02:00
Frédéric FRANCE
f53e3e9cce
Update facture.class.php 2022-09-21 09:42:44 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Regis Houssin
a3a973466f FIX broken feature, wrong fk_parent_line after cloning object 2022-09-13 15:16:17 +02:00
Laurent Destailleur
09700a6aa7 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 18:35:36 +02:00
Laurent Destailleur
6f77359617 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 18:11:06 +02:00
Laurent Destailleur
c01c595cfd
Merge pull request #22147 from frederic34/patch-5
doc
2022-09-09 15:59:23 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Frédéric FRANCE
5b213b2b1a
doc 2022-09-08 15:18:52 +02:00
Laurent Destailleur
b33b39e3b9
Merge pull request #22091 from aspangaro/14p39
FIX Column label
2022-09-07 13:12:09 +02:00
Laurent Destailleur
f27a49d30c Fix missing var 2022-09-07 12:45:43 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Alexandre SPANGARO
a542c86bcd FIX Project - on global view, missing display of ref customer 2022-09-04 04:59:31 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022
Update code
2022-09-03 11:44:36 +02:00
Philippe GRAND
5a98b72faf Update code 2022-09-03 11:14:05 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Laurent Destailleur
027e597776
Merge branch 'develop' into productbatch 2022-09-02 10:11:47 +02:00
Laurent Destailleur
3d9b57ac3f Clean code 2022-09-02 09:35:10 +02:00
Philippe GRAND
52bc56bc25 update code 2022-09-01 09:42:58 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
d44a75d7c9 update code 2022-08-31 22:05:18 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Alexandre SPANGARO
bcc87dd479 Use isModEnabled 2022-08-29 11:24:07 +02:00
Alexandre SPANGARO
a269b1181a Use isModEnabled 2022-08-29 11:23:57 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
c545756b6e
Revert "FIX : VAT rate recalculation" 2022-08-03 17:06:19 +02:00
jpb
cec9725ced FIX : VAT rate recalculation
set a checkbox on clone formquestion
2022-08-01 16:28:44 +02:00
marc
c31a924812 The return code 0 is not an error but the serveur refuse to execute the request 2022-07-24 16:50:08 +02:00
marc
3ebf64de63 Fix #21536
API Invoice Delete doesn't raise exception in some case
2022-07-24 11:57:42 +02:00
Laurent Destailleur
eeb967b540 Fix missing link to invoice 2022-07-12 11:59:33 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
Laurent Destailleur
4e4c482915
Merge pull request #20468 from OPEN-DSI/14.0_fix_invoice_situation_with_credit_note
FIX - Case of invoice situation at 100% with a credit note
2022-07-11 10:50:42 +02:00
Laurent Destailleur
bdfa0536a6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 14:20:44 +02:00
Laurent Destailleur
245580bfa5 FIX Several pb in invoice remind (html detection, no event, transaction) 2022-07-08 14:11:13 +02:00
Laurent Destailleur
da03175c07
Merge branch 'develop' into dev_19763 2022-07-07 23:06:22 +02:00
Laurent Destailleur
ca42be7478 Fix error management 2022-07-07 22:46:06 +02:00
Laurent Destailleur
f6a39383d3 Fix error management 2022-07-07 22:35:56 +02:00
Laurent Destailleur
2f269c75de Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/bills.lang
2022-07-07 20:12:23 +02:00
Laurent Destailleur
b2e4b6ab5d FIX Send remind to pay invoice only on validated invoices 2022-07-07 19:10:46 +02:00
Laurent Destailleur
f6b0710baf FIX Can convert a partially closed down payment when close for
bankcharge
2022-07-05 21:04:24 +02:00
Laurent Destailleur
5e451e1155 FIX Can convert a partially closed down payment when close for
bankcharge
2022-07-05 20:59:42 +02:00
Laurent Destailleur
f09638972c Debug v16 2022-06-27 10:45:04 +02:00
HENRY Florian
770abb73f6
Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
9aa48df111
Merge pull request #19566 from vincentjdc/customer-invoices-import
Adds import for customer invoices and invoices lines
2022-06-12 20:32:43 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Laurent Destailleur
b43159db6d
Merge branch 'develop' into dev_19763 2022-05-24 22:07:50 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
Laurent Destailleur
6771d96b47 phpcs 2022-05-21 23:07:22 +02:00
stickler-ci
bd42680e2c Fixing style errors. 2022-05-21 14:43:30 +00:00
Sylvain Legrand
3fc8adf13e missing MULTI CURRENCY on recurrent invoices #20664 2022-05-21 16:42:27 +02:00
Laurent Destailleur
2c2544d471 Fix scrutinizer 2022-05-21 15:31:08 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Laurent Destailleur
7fd3bb0aae Remove deprecated code 2022-05-19 12:08:03 +02:00
Laurent Destailleur
38aced687b Fix scrutinizer 2022-05-18 23:52:43 +02:00
Laurent Destailleur
6b88655213 Fix num_rows 2022-05-18 23:40:42 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
Laurent Destailleur
fe7483ccce
Merge pull request #20864 from thomas-Ngr/develop_fix_allow_modify_validated_draft_invoice
allow to modify invoices that have been validated in the past
2022-05-16 21:02:53 +02:00
Laurent Destailleur
d13cb10c8b
Update facture.class.php 2022-05-16 21:02:09 +02:00
Thomas Negre
82017d7a39 allow to modify invoices that have been validated in the past 2022-05-13 11:43:56 +02:00
Florian HENRY
8ebeb0bf8a add c_action_trigger for auto batch invoice création 2022-05-13 11:29:48 +02:00
Florian HENRY
0425becc03 add c_action_trigger and fix travis 2022-05-13 11:23:49 +02:00
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +02:00
stickler-ci
f70a9ad04c Fixing style errors. 2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
bc6cd8cc1c NEW : update rank line is possible on API for customer invoices 2022-05-11 15:34:16 +02:00
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
358685e9d7
Merge pull request #20761 from javieralapps4up/patch-1
Using deprecated $tmpinvoice->fk_soc
2022-05-04 00:02:15 +02:00
Laurent Destailleur
6ebe41324f Fix php8 compatibility 2022-05-03 16:29:57 +02:00
Laurent Destailleur
420ab9f16c FIX Too many requets. On large order, fix n(n+1) sql into a n sql. 2022-05-03 14:18:48 +02:00
Laurent Destailleur
3515097e4f FIX Autoset rank on recuring invoice line was not working. 2022-05-03 14:05:02 +02:00
javieralapps4up
f4f8b67d10
Using deprecated $tmpinvoice->fk_soc
Use of deprecated $tmpinvoice->fk_soc instead of using $tmpinvoice->socid
2022-05-02 12:57:13 +02:00
Laurent Destailleur
3a80ece0fd
Merge pull request #20717 from aspangaro/16a21
FIX Check field accountancy code customer is mandatory in mass action
2022-04-29 18:50:21 +02:00
Laurent Destailleur
559694dd4f API doc 2022-04-28 19:05:23 +02:00
Alexandre SPANGARO
8d3c2e34f4 FIX Check field accountancy code customer is mandatory in mass action 2022-04-26 11:46:00 +02:00
Florian HENRY
902301659b finish invoice per product per line 2022-04-13 09:31:30 +02:00
Laurent Destailleur
98c7139859 Fix regression on fetchObjectLinked when used in loop on a static object 2022-04-12 10:34:50 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Laurent Destailleur
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +02:00
Laurent Destailleur
4ff8969bac
Merge pull request #19393 from atm-gauthier/NEW/addline_with_position_choice_develop
New/addline with position choice develop
2022-04-08 16:09:44 +02:00
Laurent Destailleur
1d879bc996 FIX numbering method when mask include {cccc} 2022-04-08 10:19:20 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Christophe Battarel
56bfa20d70 FIX : dont update object price on each iteration when updating situation for all lines 2022-04-07 15:59:42 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge
can merge products
2022-04-07 15:02:03 +02:00
Laurent Destailleur
f0433244aa Fix sql 2022-04-05 13:36:25 +02:00
kamel
2ca5c38f0a Add test for checking if parent invoice is of type 'situation' 2022-04-04 10:40:10 +02:00
kamel
a7482a9ea0 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_invoice_situation_with_credit_note 2022-04-04 10:34:30 +02:00
kamel
6cac982507 FIX - Fix the adding of lines in the create invoice functions 2022-04-04 10:32:17 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
2022-04-02 10:31:58 +02:00
atm-florian
5a52650548 FIX: missing trigger DELETE for FactureRec, FactureFournisseurRec
+ trigger name consistency ('UPDATE' -> 'MODIFY')
 + preparing future consistency mechanism with class constant
2022-04-01 19:07:17 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date
NEW: check invoice date
2022-03-29 16:07:31 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
a415711a66 Fix phpcs 2022-03-29 15:47:54 +02:00
Laurent Destailleur
5f2ba49dfa Fix regression 2022-03-29 15:20:36 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
2022-03-29 15:02:29 +02:00
Laurent Destailleur
e2425c10e0 Fix log 2022-03-28 21:12:57 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
kamel
e6a989e51a FIX - Case of invoice situation at 100% with a credit note
Set situation_final to 0 if is a credit note and the invoice source is a invoice situation (case when invoice situation is at 100%) when the credit note is validated
 So we can continue to create new invoice situation
2022-03-25 17:00:23 +01:00
lvessiller
8a7b97bed1 FIX check thirdparty object loaded and properties exist 2022-03-25 16:47:41 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Laurent Destailleur
02e2f9815d NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END 2022-03-22 11:47:25 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Thomas Negre
7f527b85b0 use double quotes to compose SQL requests 2022-03-09 09:34:50 +01:00
Thomas Negre
4ad92a04fc stickler corrections 2022-03-09 09:25:52 +01:00
Thomas Negre
eda9622c9c Facture: enhance validation by adding INVOICE_CHECK_POSTERIOR_DATE option 2022-03-09 09:25:52 +01:00
Thomas Negre
ad416ef792 Facture: create method willBeLastOfSameType() 2022-03-09 09:25:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
lvessiller
19ad231012 FIX stickler-ci 2022-03-08 12:02:05 +01:00
lvessiller
397776d4a4 FIX check mandatory thirdparty fields for mass action 2022-03-08 11:29:01 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Laurent Destailleur
99ddef0530 NEW Add API to get a tempalte invoice 2022-02-28 10:37:03 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0
More generic management of parentline
2022-02-16 20:25:04 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00