Commit Graph

12406 Commits

Author SHA1 Message Date
Laurent Destailleur
b4c8fbdec2 Fix remove "use Stripe\" 2022-07-21 11:09:42 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Alexandre SPANGARO
ce15b8c44e FIX #21472 On the bank transfer lists, a change of page switches to the lists of the direct debit module 2022-07-18 07:23:25 +02:00
Alexandre SPANGARO
149b86e459 FIX Bank transfer - Link on code supplier invoice was bad 2022-07-16 06:34:52 +02:00
Alexandre SPANGARO
71af854bf4 FIX Bank transfer - Link on supplier invoice was bad 2022-07-15 17:31:30 +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
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +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
ca42be7478 Fix error management 2022-07-07 22:46:06 +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
77b1bccea9 Restore old version to fix serious regressions and sql errors 2022-07-07 20:05:22 +02:00
Laurent Destailleur
e60c6ae96d Revert "FIX count elements in invoice list (Issue #21444)"
This reverts commit db863e4db6.
2022-07-07 20:00:03 +02:00
Laurent Destailleur
e10820a350 Revert "FIX sql order"
This reverts commit 3eb3c700b9.
2022-07-07 19:59:37 +02:00
Laurent Destailleur
f9d13290d5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/facture/list.php
2022-07-07 19:15:58 +02:00
Laurent Destailleur
b2e4b6ab5d FIX Send remind to pay invoice only on validated invoices 2022-07-07 19:10:46 +02:00
lvessiller
3eb3c700b9 FIX sql order 2022-07-06 18:28:40 +02:00
lvessiller
db863e4db6 FIX count elements in invoice list (Issue #21444) 2022-07-06 17:58:01 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
a0caf7be71
Merge pull request #21394 from cfoellmann/PR/improve-page-titles
fix page titles
2022-07-06 15:55:10 +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
c3f6833add css 2022-07-05 20:32:22 +02:00
Laurent Destailleur
e6e4017047 Fix debug for php 8.1 2022-07-03 14:29:59 +02:00
Laurent Destailleur
046fa77a5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-29 16:46:27 +02:00
Laurent Destailleur
64c661b7f8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-06-29 10:10:15 +02:00
Laurent Destailleur
bea16a5256 Fix SEPA file with special chars 2022-06-28 14:50:43 +02:00
Laurent Destailleur
485c85a2a3 Fix SEPA 2022-06-28 14:49:03 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-27 12:11:40 +02:00
Laurent Destailleur
f09638972c Debug v16 2022-06-27 10:45:04 +02:00
Christian Foellmann
55d90ec560 set the target for SOC links on proposals and invoices to the customer tab 2022-06-25 16:24:55 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled
Use getDolGlobalString
2022-06-23 09:55:31 +02:00
Laurent Destailleur
c71fe009df Fix signature delete 2022-06-22 16:07:03 +02:00
Laurent Destailleur
313cff77d0
Merge pull request #21255 from aspangaro/16b4-php8_1
PHP 8 in social contribution
2022-06-22 15:39:29 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Alexandre SPANGARO
f2ef565a0f FIX PHP8 2022-06-20 04:57:38 +02:00
Alexandre SPANGARO
5f5cf4b291 Fix PHP8 2022-06-20 04:28:32 +02:00
Alexandre SPANGARO
2b07d00027 Fix PHP8 2022-06-20 03:29:17 +02:00
Alexandre SPANGARO
b80be7ef7a Fix PHP8 2022-06-19 22:59:49 +02:00
Alexandre SPANGARO
50e5cf1a56 Fix fetch label journal 2022-06-19 21:29:45 +02:00
Alexandre SPANGARO
0903f390c1 Merge remote-tracking branch 'upstream/develop' into 16b4-php8_1 2022-06-19 06:47:29 +02:00
Laurent Destailleur
bc1449f1c2 Fix sepa generation (no special char _) 2022-06-18 20:51:58 +02:00
Laurent Destailleur
227ac2baae
Merge pull request #21172 from aspangaro/17p2
Look & Feel - Align amount to right on card
2022-06-17 18:07:30 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-17 14:52:51 +02:00
Laurent Destailleur
18d9d6194e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-17 14:48:27 +02:00
Thomas Negre
3fcaae5ae3 fix private notes not being registered on credit/replacement invoices 2022-06-16 15:33:25 +02:00
Florian HENRY
77d129f79c fix: bad url param search for facrec filter on facture list 2022-06-16 15:05:45 +02:00
Laurent Destailleur
8bd95ae93d Fix char _ not alloed into SEPA 2022-06-15 16:20:27 +02:00
Alexandre SPANGARO
863a18b839 Merge remote-tracking branch 'upstream/develop' into 17p2 2022-06-15 04:16:40 +02:00
Laurent Destailleur
7971683b60
Merge pull request #21277 from badre-agtaib/scru5
FIX BUG: timestamp type is int not tms
2022-06-14 21:10:36 +02:00
bagtaib
3718afb16f timestamp type is int not tms 2022-06-14 17:56:55 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Alexandre SPANGARO
56e03b9a11 PHP 8 in social contribution 2022-06-14 09:22:53 +02:00
Alexandre SPANGARO
f94b25c837 PHP 8 in social contribution 2022-06-14 09:14:56 +02:00
Alexandre SPANGARO
bba32869a3 PHP 8 in social contribution 2022-06-14 09:14:30 +02:00
Alexandre SPANGARO
4cbe6fb48d PHP 8 in social contribution 2022-06-14 09:14:14 +02:00
Alexandre SPANGARO
489ed743be PHP 8 in social contribution 2022-06-14 09:14:08 +02:00
Alexandre SPANGARO
cfed286e63 PHP 8 in social contribution 2022-06-14 09:14:00 +02:00
Alexandre SPANGARO
37ff10eafc PHP 8 in social contribution 2022-06-14 09:13:53 +02:00
Laurent Destailleur
a2c2ca2074 Fix phpcs 2022-06-13 15:10:35 +02:00
Laurent Destailleur
12ee8eb40b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2022-06-13 13:32:11 +02:00
Laurent Destailleur
cedf6f8057 # WARNING: head commit changed in the meantime
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-06-13 13:26:59 +02:00
Nicolas F
5decd00149
fix: remove duplication bank transaction
do not duplicate previous bank transaction when value is 0
2022-06-13 10:40:41 +00:00
Laurent Destailleur
071b0a3192
Merge pull request #21231 from aspangaro/16b4-php8_1
FIX PHP8 on bank
2022-06-13 12:39:38 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Alexandre SPANGARO
10ff061672 Fix PHP8 on bank 2022-06-13 04:38:16 +02:00
Alexandre SPANGARO
3032de261d Fix PHP8 on bank 2022-06-13 04:37:56 +02:00
Alexandre SPANGARO
25c2fb0528 Fix PHP8 on bank 2022-06-13 04:37:41 +02:00
Alexandre SPANGARO
9c8f7bd174 Fix PHP8 on bank 2022-06-13 03:56:46 +02:00
Alexandre SPANGARO
74e74e2377 Fix PHP8 on bank 2022-06-13 03:53:40 +02:00
Alexandre SPANGARO
3d5227918d Fix PHP8 on bank 2022-06-13 03:53:35 +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
Frédéric France
51462a276a Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-10 17:49:44 +02:00
Laurent Destailleur
d039d35732 FIX php8 compatibility 2022-06-10 16:46:09 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Laurent Destailleur
3bb8e9cdda Debug v16 2022-06-09 12:07:35 +02:00
Alexandre SPANGARO
61d5e89677 Look & Feel - Align amount to right on card 2022-06-09 04:01:02 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
648a8f5c18 FIX xml file for company with special chars in name 2022-06-07 18:58:53 +02:00
BB2A Anthony Berton
3fb2c6eaa1 FIX - Invoices index page Supplier enable 2022-06-07 16:55:57 +02:00
Laurent Destailleur
d85e4e1bce Fix warning 2022-06-03 15:25:38 +02:00
Laurent Destailleur
7f3826609a Fix var not defined 2022-06-03 14:34:38 +02:00
Laurent Destailleur
309eccc426 Fix phpcs 2022-06-03 14:08:04 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
f53060fec3 FIX selection of type of invoice 2022-06-02 19:43:41 +02:00
Laurent Destailleur
9df4e4dcb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-02 19:40:06 +02:00
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
4e033ba576 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:34:32 +02:00
Laurent Destailleur
ed5b8df385 FIX Bank account not set when creating invoice from order 2022-06-02 19:34:16 +02:00
Laurent Destailleur
10c101077b Fix auto check 2022-06-02 19:28:18 +02:00
Laurent Destailleur
a579859ab5
Merge pull request #21044 from defrance/patch-195
php V8 warning ($conf->c part 1
2022-06-02 15:44:04 +02:00
Laurent Destailleur
cb5f2333b2 Fix default sort order 2022-06-02 13:02:06 +02:00
Laurent Destailleur
bc79f041dc Debug v16 2022-06-02 11:11:28 +02:00
Alexandre SPANGARO
7b55676b56 Merge branch '14.0' into 14a35 2022-06-01 23:12:02 +02:00
Alexandre SPANGARO
1dcd4d0ab6 Typo in CSS class 2022-06-01 23:11:20 +02:00
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
Laurent Destailleur
49ded63cbc
Merge pull request #21052 from defrance/patch-197
php V8 warning
2022-06-01 21:57:21 +02:00
Laurent Destailleur
93499d611c
Update index.php 2022-06-01 21:57:03 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
2d0958ba7f Look and feel v16 2022-05-31 11:00:21 +02:00
stickler-ci
e8bc813a43 Fixing style errors. 2022-05-30 06:36:37 +00:00
BENKE Charlene
2b76e67d42
php V8 warning 2022-05-30 08:31:38 +02:00
BENKE Charlene
7dc93b3544
php v8 warning 2022-05-30 08:23:35 +02:00
BENKE Charlene
bc8f20b5cb
php V8 warning 2022-05-27 16:40:18 +02:00
BENKE Charlene
869ec8e461
php V8 warning 2022-05-27 16:39:08 +02:00
Laurent Destailleur
9a7c28d61d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-25 09:12:59 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +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
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
2022-05-24 16:27:26 +02:00
Laurent Destailleur
eaa0170604 Trans 2022-05-23 20:05:30 +02:00
Laurent Destailleur
b693a2f10c Fix typo 2022-05-23 19:43:31 +02:00
Laurent Destailleur
23468929df Clean code 2022-05-23 09:13:37 +02:00
Laurent Destailleur
660df4809a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-22 17:19:31 +02:00
Laurent Destailleur
ac88e5f59e
Merge pull request #20980 from atm-maxime/fix_scrutinizer1
Fix scrutinizer and remove unused functions
2022-05-22 17:18:34 +02:00
Laurent Destailleur
deb969e2f3 Var not used 2022-05-22 17:11:41 +02:00
Laurent Destailleur
1bce02fad2
Merge pull request #20986 from grandoc/new_branch_22_05_2022
fix : The property lib does not exist on PaymentVAT
2022-05-22 17:09:51 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Philippe GRAND
2bbdd56fef fix : The property totalpaye does not exist on Tva 2022-05-22 15:26:12 +02:00
Philippe GRAND
c4e19824e8 fix : The property lib does not exist on PaymentVAT 2022-05-22 15:11:09 +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
Maxime Kohlhaas
c3fb7647c5 Fix delete customer payment 2022-05-22 02:30:35 +02:00
Laurent Destailleur
038ce0c543
Merge pull request #20973 from lmag/fix_number_cheque_receipt_list_bank_entries
fix : number cheque receipt list_bank entries #5366
2022-05-22 01:55:09 +02:00
Maxime Kohlhaas
0559cc08ac Fix scrutinizer remove unused functions 2022-05-22 01:28:27 +02:00
stickler-ci
4913acaba6 Fixing style errors. 2022-05-21 22:11:20 +00:00
lmag
ea96a18b61 fix : number cheque receipt list_bank entries #5366 2022-05-22 00:07:21 +02:00
Laurent Destailleur
0713c27a5d
Merge pull request #20967 from grandoc/new_branch_21_05_2022_02
New branch 21 05 2022 02
2022-05-21 23:56:54 +02:00
Laurent Destailleur
7dcc66eeef Fix phpcs 2022-05-21 23:17:14 +02:00
Laurent Destailleur
6771d96b47 phpcs 2022-05-21 23:07:22 +02:00
Laurent Destailleur
cde2af7614 Fix var missing 2022-05-21 23:05:51 +02:00
Philippe GRAND
526c6fcc0e fix : The property num_prelevement does not exist on Paiement 2022-05-21 22:41:27 +02:00
Philippe GRAND
7580a4c1ff fix : The property id_prelevement does not exist on Paiement 2022-05-21 22:35:49 +02:00
Philippe GRAND
65b6af12f8 fix : The property am does not seem to exist on Tva 2022-05-21 22:23:06 +02:00
Philippe GRAND
91bb04bdba fix : The property total does not exist on Tva 2022-05-21 22:16:43 +02:00
Philippe GRAND
f5f026c2c5 fix : The property paiementtype does not seem to exist on Tva 2022-05-21 22:13:57 +02:00
Philippe GRAND
cde540fb2a fix : The property paiementtype does not seem to exist on PaymentVAT 2022-05-21 22:10:45 +02:00
Philippe GRAND
27b4961466 fix : The property datepaye does not exist on PaymentVAT 2022-05-21 22:09:02 +02:00
Philippe GRAND
0ae21ad900 fix : The property chid does not seem to exist on PaymentVAT 2022-05-21 22:06:22 +02:00
Laurent Destailleur
39258bc7c0
Merge pull request #20957 from grandoc/new_branch_21_05_2022
fix : The property chid does not seem to exist on PaymentSocialContri…
2022-05-21 19:11:42 +02:00
Philippe GRAND
8ba445b27c fix : The property am does not seem to exist on ChargeSociales 2022-05-21 18:11:34 +02:00
Philippe GRAND
bff81ce9bb fix : The property does not exist on ChargeSociales 2022-05-21 18:02:48 +02:00
Philippe GRAND
604a4670e0 fix : The property does not exist on PaymentSocialContribution 2022-05-21 17:50:43 +02:00
Philippe GRAND
c9e812d5ef fix : The property datepaye does not exist on PaymentSocialContribution 2022-05-21 17:47:25 +02:00
Philippe GRAND
426d8912a7 fix : The property chid does not seem to exist on PaymentSocialContribution 2022-05-21 17:40:14 +02:00
Regis Houssin
28540a85f2 FIX php8 compatibility 2022-05-21 17:36:19 +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
Laurent Destailleur
ef32179ba7
Merge pull request #20935 from atm-maxime/fix_fields_check_enabled
Fix : fields must check module enabled
2022-05-21 00:48:22 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Regis Houssin
a302ffa5fb FIX wrong var name 2022-05-20 17:51:16 +02:00
Laurent Destailleur
7fd3bb0aae Remove deprecated code 2022-05-19 12:08:03 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +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
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
Laurent Destailleur
a483af70df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/contrat/index.php
2022-05-17 23:27:11 +02:00
Laurent Destailleur
c475789433 Debug v16 2022-05-17 23:23:50 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +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
Laurent Destailleur
7890d6f7f6
Update card.php 2022-05-16 21:01:48 +02:00
Laurent Destailleur
4cc1f67632 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/line.php
2022-05-16 16:03:07 +02:00
Laurent Destailleur
61153f04c8
Merge branch 'develop' into dev_event_factrec 2022-05-16 15:34:39 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +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
fa6d738037 NEW: Add event block on facture_rec #20870 2022-05-13 10:46:02 +02:00
Laurent Destailleur
85cddf638f Fix can fix a corrupted lost bank account on bank account lines 2022-05-12 11:06:22 +02:00
Laurent Destailleur
1768c3d926 Code more robust when fk_account has been corrupted 2022-05-12 10:48:34 +02:00
Laurent Destailleur
c46303c0e6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:47:31 +02:00
Laurent Destailleur
de19783f19 Fix log 2022-05-12 10:36:18 +02:00
Laurent Destailleur
4e87e47451 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-12 10:35:00 +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
Laurent Destailleur
2dc97ac3ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/errors.lang
2022-05-10 17:16:11 +02:00
Laurent Destailleur
7b21e0b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:06:32 +02:00
Laurent Destailleur
8ef75ecc7c Better fix fox #20807 2022-05-10 15:27:43 +02:00
Laurent Destailleur
fc718e68ee css 2022-05-10 11:38:56 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-09 16:53:53 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
stickler-ci
017eb99e86 Fixing style errors. 2022-05-09 07:53:37 +00:00
Pierre Ardoin
ec00c6fef2
line deleted when updated after rapproched
Fix an issue that deletes line when we update data after its rappro.
2022-05-09 09:49:07 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
cfe347de17
Merge pull request #20799 from FHenry/15.0_fix_invoice_stat
fix: invoice stat
2022-05-08 19:03:55 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Florian HENRY
318e403013 fix: invoice stat 2022-05-06 16:15:52 +02:00
Laurent Destailleur
a99e647348
Merge pull request #20658 from Hystepik/develop#1
NEW #20653 edit discount pourcentage for all lines in one shot
2022-05-04 01:20:49 +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
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Laurent Destailleur
6ebe41324f Fix php8 compatibility 2022-05-03 16:29:57 +02:00
Laurent Destailleur
3ae6a1d786 Fix preselection of type of invoice 2022-05-03 16:18:52 +02:00
Laurent Destailleur
30bb2c5c2f FIX Too many requets. On large order, fix n(n+1) sql into a n sql. 2022-05-03 15:57:17 +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
c87c695d43 Debug v16 2022-05-03 14:15:42 +02:00
Laurent Destailleur
3515097e4f FIX Autoset rank on recuring invoice line was not working. 2022-05-03 14:05:02 +02:00
Laurent Destailleur
0e429ef058 Look and feel v16 2022-05-02 20:26:34 +02:00
Laurent Destailleur
6aa32e7c70 Retrograde intracommreport from experimental to dev 2022-05-02 20:21:58 +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
d7398f573c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-01 20:49:43 +02:00
Laurent Destailleur
6308b700d5 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-05-01 20:47:54 +02:00
Laurent Destailleur
971714f8e3 phpcs 2022-05-01 20:46:23 +02:00
Laurent Destailleur
1a589c5f18
Merge pull request #20656 from FHenry/dev_20652
NEW: Add column template invoice in invoice list
2022-05-01 13:49:02 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
6a2526ae65 Responsive 2022-04-29 19:04:46 +02:00
Laurent Destailleur
0e710b05cd
Merge pull request #20667 from leninrivas/patch-3
Show only code multicurrency in lists
2022-04-29 18:56:11 +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
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
2022-04-29 17:35:36 +02:00
BENKE Charlene
364799582a fix : allow cut&paste as real numeric value to excel 2022-04-29 17:24:55 +02:00
Laurent Destailleur
38c0264971 Show warning if not journal not defined 2022-04-29 17:15:42 +02:00
Laurent Destailleur
223db9bb76 Fix: Not SetEventMessages inside a CRUD class. 2022-04-29 14:32:47 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
2022-04-28 19:23:13 +02:00
Laurent Destailleur
559694dd4f API doc 2022-04-28 19:05:23 +02:00
Laurent Destailleur
93815404a2 Fix phpcs 2022-04-28 18:46:52 +02:00
Florian HENRY
dd85c22927 remove combox search box 2022-04-27 08:50:58 +02:00
Alexandre SPANGARO
8d3c2e34f4 FIX Check field accountancy code customer is mandatory in mass action 2022-04-26 11:46:00 +02:00
Laurent Destailleur
8de9d63f7d FIX Numbering of sepa files 2022-04-26 00:35:20 +02:00
Laurent Destailleur
16c607f4d8 Fix responsive 2022-04-24 18:55:52 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices
FIX tool to fix bank account not in main currency for vendor invoice
2022-04-19 23:24:08 +02:00
Lenin Rivas
8caa45ee80
Show only code multicurrency in lists 2022-04-18 12:22:29 -05:00
Regis Houssin
cc9c49afc9 TODO ICS is not used with bank transfer 2022-04-15 16:40:41 +02:00
Regis Houssin
81f0aedc8f FIX SEPA ICS is not mandatory for bank transfer 2022-04-15 16:17:03 +02:00
lmarcouiller
1ccf209c47 Close #20653 : edit discount pourcentage 2022-04-15 14:31:44 +02:00
Florian HENRY
292df417fe NEW: Add column template invoice in invoice list 2022-04-15 11:32:53 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/index.php
2022-04-14 16:10:23 +02:00
Laurent Destailleur
ae412d37ed Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:16 +02:00
Laurent Destailleur
6a7212a48d Fix sql error 2022-04-12 22:02:46 +02:00
Laurent Destailleur
1bfd9c695f
Update tva.class.php 2022-04-12 16:29:25 +02:00
stickler-ci
adda436dab Fixing style errors. 2022-04-12 12:45:05 +00:00
kevin
c51aff99af Add missing entity on adding new VAT 2022-04-12 14:38:17 +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
c035ee6f2a Look and feel v16 2022-04-11 19:21:04 +02:00
Laurent Destailleur
1aecff854b Fix missing limit in redirect 2022-04-09 14:40:29 +02:00
Laurent Destailleur
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
42f82486da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:59:19 +02:00
Laurent Destailleur
b8c8d2af93 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:56:42 +02:00
Laurent Destailleur
eecbc05bc3 Show amount into popup of payment 2022-04-09 00:06:02 +02:00
Laurent Destailleur
003bcd60fa FIX Add protection on bad input of payment on multicurrency invoices 2022-04-08 19:52:40 +02:00
Laurent Destailleur
0673a4826a FIX currency visible into tooltip 2022-04-08 17:13:41 +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
099e7aaeb5
Merge pull request #20532 from OPEN-DSI/fix_add_line_when_create_invoice
FIX - Fix the adding of lines in the create invoice functions
2022-04-08 15:33:35 +02:00
Laurent Destailleur
6169f76a34 Add log for debug. Make new method for stripe payment an option. 2022-04-08 12:38:49 +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
4cac6b7e29 css 2022-04-07 14:03:14 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
Laurent Destailleur
091ca31b6c NEW Add method hintindex() in database handlers. 2022-04-06 17:32:56 +02:00
Laurent Destailleur
32875a1e6c Fix trans 2022-04-06 17:06:49 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
Laurent Destailleur
33b5605a72 Code comment 2022-04-06 16:49:59 +02:00
Laurent Destailleur
5a8d5618f2 Fix error message on IBAN/BIC validation 2022-04-06 16:15:34 +02:00
Laurent Destailleur
2e91b0107a Fix missing data in tooltip 2022-04-06 15:35:49 +02:00
Laurent Destailleur
c2f2f98235 css 2022-04-06 15:25:37 +02:00
Laurent Destailleur
a528cd46bd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/card.php
2022-04-06 15:17:29 +02:00
Laurent Destailleur
1988459aa8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-06 14:54:02 +02:00
Laurent Destailleur
9459971ba4 Removed the awful "group by" on list of invoices. Add index on datef. 2022-04-06 14:53:22 +02:00
Laurent Destailleur
c3ae63f587 FIX out of memory when more than 100 000 invoices. 2022-04-06 11:34:49 +02:00
Laurent Destailleur
7896baa6c9 css 2022-04-05 18:20:45 +02:00
Laurent Destailleur
91909928d4 FIX Can't edit bank record 2022-04-05 18:19:06 +02:00
Laurent Destailleur
a8a83b30dc FIX Can't edit bank record 2022-04-05 18:17:45 +02:00
Laurent Destailleur
c7d5ecd4f7 Renamed hidden option INVOICE_CAN_ALWAYS_BE_EDITED into
INVOICE_CAN_BE_EDITED_EVEN_IF_PAYMENT_DONE for better understanding.
2022-04-05 17:39:56 +02:00
Laurent Destailleur
f0433244aa Fix sql 2022-04-05 13:36:25 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
Laurent Destailleur
01d100fc0c Missing autofocus on title field 2022-04-04 15:11:29 +02:00
Laurent Destailleur
5960d5971c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-04 10:49:51 +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
1c71a8da1e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-03 17:27:15 +02:00
Laurent Destailleur
440b5350df # WARNING: head commit changed in the meantime
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-04-03 17:19:27 +02:00
Laurent Destailleur
edf779505c FIX download of file must be done using a GET href link, not a POST. 2022-04-03 17:12:45 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +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
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
8349e48559 Reponsive 2022-04-01 11:24:45 +02:00
Laurent Destailleur
ca55bd157a Look and feel v16 2022-03-31 11:47:18 +02:00
Laurent Destailleur
5062064e9a css 2022-03-31 11:38:40 +02:00
Laurent Destailleur
5ffb6e2546 Look and feel v15 2022-03-31 11:34:12 +02:00
Laurent Destailleur
800080c06f FIX Navigation between invoices 2022-03-30 18:42:17 +02:00
Laurent Destailleur
97a7450f10 NEW Auto set invoice paid when adding credit not and remain to pay is 0 2022-03-30 18:41:45 +02:00
kamel
a22450391f FIX - Fix search by filters 2022-03-30 15:50:36 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
ATM john
75d7c439dd Merge branch '14.0_fix_regression_selct_extrafield_search' of github.com:atm-john/dolibarr into new_fix_regression_select_extrafield_search 2022-03-30 11:09:29 +02:00