Commit Graph

12488 Commits

Author SHA1 Message Date
Alexandre SPANGARO
7aa371815a Use isModEnabled 2022-08-29 11:25:07 +02:00
Alexandre SPANGARO
502078cf37 Use isModEnabled 2022-08-29 11:25:00 +02:00
Alexandre SPANGARO
b978371800 Use isModEnabled 2022-08-29 11:24:54 +02:00
Alexandre SPANGARO
10e41b6c09 Use isModEnabled 2022-08-29 11:24:48 +02:00
Alexandre SPANGARO
acc1c519cc Use isModEnabled 2022-08-29 11:24:44 +02:00
Alexandre SPANGARO
78431e0d66 Use isModEnabled 2022-08-29 11:24:40 +02:00
Alexandre SPANGARO
4f2cd0419a Use isModEnabled 2022-08-29 11:24:36 +02:00
Alexandre SPANGARO
1a4c722a49 Use isModEnabled 2022-08-29 11:24:30 +02:00
Alexandre SPANGARO
bf3f406788 Use isModEnabled 2022-08-29 11:24:26 +02:00
Alexandre SPANGARO
fb63c066fc Use isModEnabled 2022-08-29 11:24:17 +02:00
Alexandre SPANGARO
93cfa2797d Use isModEnabled 2022-08-29 11:24:13 +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
Alexandre SPANGARO
4075397f7a Use isModEnabled 2022-08-29 11:23:50 +02:00
Alexandre SPANGARO
6fd2bbe46c Use isModEnabled 2022-08-29 11:23:40 +02:00
Alexandre SPANGARO
d633576ed9 Use isModEnabled 2022-08-29 11:22:38 +02:00
Alexandre SPANGARO
b2ee6fdc2e Use isModEnabled 2022-08-29 11:22:31 +02:00
Alexandre SPANGARO
dc059eccab Use isModEnabled 2022-08-29 11:22:21 +02:00
Alexandre SPANGARO
93c69aaaff Use isModEnabled 2022-08-29 11:22:14 +02:00
Alexandre SPANGARO
c2b2d66662 Use isModEnabled 2022-08-29 11:22:10 +02:00
Alexandre SPANGARO
20a4e52192 Use isModEnabled 2022-08-29 11:22:04 +02:00
Alexandre SPANGARO
dcebffbd01 Use isModEnabled 2022-08-29 11:21:49 +02:00
Alexandre SPANGARO
1d875ef025 Use isModEnabled 2022-08-29 11:21:34 +02:00
Alexandre SPANGARO
88a68c12db Use isModEnabled 2022-08-29 11:21:27 +02:00
Alexandre SPANGARO
f091821f71 Use isModEnabled 2022-08-29 11:21:19 +02:00
Alexandre SPANGARO
f174b36dcf Use isModEnabled 2022-08-29 11:20:47 +02:00
Laurent Destailleur
d0e08818e1
Merge pull request #21931 from grandoc/new_branch_27_08_2022
FIX php8 compatibility
2022-08-29 01:09:49 +02:00
Philippe GRAND
b886210df3 FIX php8 compatibility 2022-08-28 13:51:29 +02:00
Philippe GRAND
51fb06ed67 FIX php8 compatibility 2022-08-28 13:50:58 +02:00
Philippe GRAND
c0154f4ac8 FIX php8 compatibility 2022-08-28 13:49:41 +02:00
Philippe GRAND
87c7ffc4ed FIX php8 compatibility 2022-08-28 13:48:32 +02:00
UT from dolibit
2134201b4b
Update card.php 2022-08-27 12:41:36 +02:00
UT from dolibit
9bd7c28ffc
Update card.php
add section seperators

// General $Variables
// Permissions
// Advanced Permissions

..
2022-08-27 12:32:36 +02:00
Laurent Destailleur
bfb01ae928 Clean code 2022-08-26 18:24:42 +02:00
Laurent Destailleur
af69270a0e NEW Can enter the unit price including the vat 2022-08-26 17:39:41 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
0d693d723a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/class/api_proposals.class.php
2022-08-25 14:31:47 +02:00
Laurent Destailleur
0d735ee7d5 Fix example 2022-08-25 14:05:28 +02:00
Laurent Destailleur
0c8eeed3f6
Merge pull request #21875 from FHenry/15_fix_defaultdate_CA_report
fix:  default filter date CA selling and buying report
2022-08-25 12:20:58 +02:00
Frédéric FRANCE
ccc1396811
Merge branch 'Dolibarr:develop' into patch-4 2022-08-25 09:50:22 +02:00
Florian HENRY
c41782649c fix: use Dolibarr std method and set correct end Year on CA buying report 2022-08-24 22:20:19 +02:00
Florian HENRY
282dda8660 fix: use Dolibarr std method and set correct end Year on CA report 2022-08-24 22:17:32 +02:00
Frédéric FRANCE
99689f107d
Update card.php 2022-08-24 18:11:12 +02:00
Frédéric FRANCE
2c7037bfe3
Update card.php 2022-08-24 18:09:14 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Alexandre SPANGARO
f78ea1e73e Fix SQL 2022-08-22 21:32:15 +02:00
stickler-ci
2b4c83a680 Fixing style errors. 2022-08-22 16:42:08 +00:00
Yoan Mollard
3f1f02a8a8 Select sum of TTC payments for expense reports and 0 for HT because HT makes no sense
Only for mode RECETTES-DEPENSE
2022-08-22 18:21:24 +02:00
Laurent Destailleur
88e66ab39a
Merge pull request #21803 from frederic34/ibanForHuman
iban human readable
2022-08-22 10:53:20 +02:00
Laurent Destailleur
9e504a1ce6
Merge pull request #21805 from frederic34/patch-4
Update cashcontrol_card.php
2022-08-22 10:50:23 +02:00
Laurent Destailleur
23c489349a Fix regression 2022-08-21 23:46:34 +02:00
Alexandre SPANGARO
b77f29fa4d PHP8 Warnings, fix - Accountancy - Report of sales revenues billed by VAT rate 2022-08-20 04:13:09 +02:00
Alexandre SPANGARO
3f7df661ab PHP8 Warnings - Accountancy - Report sales revenues by product 2022-08-20 03:56:11 +02:00
Alexandre SPANGARO
ff0f44ab35 Merge branch '16p1' of https://github.com/aspangaro/dolibarr into 16p1 2022-08-20 03:26:09 +02:00
Alexandre SPANGARO
d523c64f93 PHP8 Warnings - Accountancy - Result sales revenues by user 2022-08-20 03:25:54 +02:00
stickler-ci
6bae6f5310 Fixing style errors. 2022-08-20 01:19:41 +00:00
Alexandre SPANGARO
4c8ba7db21 PHP8 Warnings / Wrong data / CSS - Accountancy - Result sales revenues by soc 2022-08-20 03:13:20 +02:00
Frédéric FRANCE
97b759f3cc
Update cashcontrol_card.php 2022-08-19 17:46:34 +02:00
Frédéric FRANCE
1ca6e04977 iban human readable 2022-08-19 17:32:54 +02:00
Frédéric FRANCE
6923bd9c06 iban human readable 2022-08-19 17:21:00 +02:00
Alexandre SPANGARO
0e5a463f30 PHP8 Warnings Accountancy - Result report 2022-08-19 07:17:48 +02:00
Alexandre SPANGARO
44d006ea58 PHP8 Warning 2022-08-19 06:46:59 +02:00
Yoan Mollard
ed627613aa Fix multiple consecutive payments of a single expense report
total_ht and total_ttc are already the sum of the whole expense report,
no need to sum.
2022-08-18 01:51:49 +02:00
Laurent Destailleur
24b1085639 Clean code. Prepare for inputing prices with taxes 2022-08-13 19:30:26 +02:00
Laurent Destailleur
baaa72c80d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-13 12:05:16 +02:00
Laurent Destailleur
498ed449e9 Fix label of invoice status 2022-08-13 12:03:41 +02:00
Laurent Destailleur
ef387e1a02 Fix token 2022-08-12 23:19:36 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
85fb7c1d5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-12 15:56:15 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
75fa3cf643 Debug v16 2022-08-12 15:45:27 +02:00
Laurent Destailleur
a6c6f2d50b Fix avoid error message when pressing enter into bank reconciliation 2022-08-11 20:49:18 +02:00
Laurent Destailleur
8c903bf935 Clean deprecated code. Fix go back to mode1 in supplier invoice 2022-08-11 20:23:44 +02:00
Laurent Destailleur
c44f75f818 css 2022-08-11 17:12:10 +02:00
Laurent Destailleur
c089fe124c
Update clientfourn.php 2022-08-11 01:37:53 +02:00
Laurent Destailleur
ead7bd91fe
Update clientfourn.php 2022-08-11 01:36:31 +02:00
Laurent Destailleur
cee88c0a61 Fix missing header 2022-08-10 18:45:06 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Yoan Mollard
4c649a227a More developer-friendly print of titles 2022-08-10 12:54:14 +02:00
lvessiller
0e0c297ed5 NEW filter on reception dates (from / to) in cheque paiement card 2022-08-08 14:56:28 +02:00
Regis Houssin
b20144c3d0 FIX php8 compatibility 2022-08-08 11:39:43 +02:00
stickler-ci
3a83676202 Fixing style errors. 2022-08-05 02:22:32 +00:00
Yoan Mollard
9db6c779f0 Fix layout of Incomes-Expenses + Claims-Debts accounting tables 2022-08-05 04:16:23 +02:00
Laurent Destailleur
c545756b6e
Revert "FIX : VAT rate recalculation" 2022-08-03 17:06:19 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
jpb
cec9725ced FIX : VAT rate recalculation
set a checkbox on clone formquestion
2022-08-01 16:28:44 +02:00
Laurent Destailleur
4c4dd53385 Fix filter on company 2022-07-31 22:46:53 +02:00
Laurent Destailleur
7dfeae694f CSS amount 2022-07-31 22:22:46 +02:00
Laurent Destailleur
9303177386 Fix regression 2022-07-31 19:12:49 +02:00
Laurent Destailleur
f0c8523713 Debug v16 2022-07-29 14:57:11 +02:00
Laurent Destailleur
7404e8fb75 Debug v16 2022-07-29 14:50:21 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-26 12:24:24 +02:00
Laurent Destailleur
72dbe02958 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 12:19:09 +02:00
Laurent Destailleur
46d3647877 Merge 2022-07-26 12:18:56 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +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
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
2022-07-22 17:43:35 +02:00
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-22 17:38:24 +02:00
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
Laurent Destailleur
e9bed0bd31 Fix remove "use Stripe\" 2022-07-21 11:08:02 +02:00
Laurent Destailleur
3079ab2737 FIX phpv8 2022-07-21 10:59:15 +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
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
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +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
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action
FIX default to create on card.php if $action is empty
2022-07-10 18:50:48 +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
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +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
ca9c869d53 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-07 22:36:16 +02:00
Laurent Destailleur
f6a39383d3 Fix error management 2022-07-07 22:35:56 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650
NEW #20650 Checkbox column on left for lists
2022-07-07 21:48:51 +02:00
Laurent Destailleur
4086f3f36c
Merge pull request #21317 from ymollard/project-reports
Filter accounting reports by projects
2022-07-07 21:20:52 +02:00
Laurent Destailleur
1e1be459b3
Update accounting-files.php 2022-07-07 21:15:28 +02:00
Laurent Destailleur
116633ed2f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-07 20:14:47 +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
Christian Foellmann
4c5e05e411 fix page titles
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
2022-07-06 19:19:08 +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
Yoan Mollard
6b421823f5 Use class instance instead of SQL req 2022-06-25 00:11:40 +02:00
Faustin
20fa31d814 NEW #20650 enabled checkcolumn on left for costumer invoice list 2022-06-24 13:07:28 +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
stickler-ci
4e2bacb039 Fixing style errors. 2022-06-19 18:26:33 +00:00
Yoan Mollard
6239172910 Fixed sanitization of int 2022-06-19 20:16:03 +02:00
stickler-ci
13511d983e Fixing style errors. 2022-06-19 17:27:15 +00:00
Yoan Mollard
eb4c42e987 Fixed AND operator to standardize code 2022-06-19 19:21:51 +02:00
Alexandre SPANGARO
0903f390c1 Merge remote-tracking branch 'upstream/develop' into 16b4-php8_1 2022-06-19 06:47:29 +02:00
Yoan Mollard
82cfca1a80 Filter accounting reports by projects 2022-06-19 00:48:06 +02:00
Laurent Destailleur
bc1449f1c2 Fix sepa generation (no special char _) 2022-06-18 20:51:58 +02:00
HENRY Florian
770abb73f6
Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +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
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
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