lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

13061 Commits

Author SHA1 Message Date
Laurent Destailleur
c01c595cfd
Merge pull request #22147 from frederic34/patch-5 
doc
 2022-09-09 15:59:23 +02:00
Alexandre SPANGARO
6b4bd6c09e FIX #21859 - Don't show html balise on list for private/public note 2022-09-09 15:56:17 +02:00
Laurent Destailleur
94e0577728
Merge pull request #22161 from dolibit-ut/patch-550 
Update transfer.php
 2022-09-09 15:52:37 +02:00
Laurent Destailleur
7e6d52c137
Merge pull request #22168 from Hystepik/develop#2 
Fix : php 8.1 warnings
 2022-09-09 15:51:03 +02:00
lmarcouiller
68b72ac17d Fix : php 8.1 warnings 2022-09-09 10:06:16 +02:00
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00
Laurent Destailleur
9a09e0f304 Merge SEPA payment using Stripe manually. 2022-09-09 02:26:45 +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
5341c7a4a1 Fix sql error 2022-09-09 01:36:58 +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
Laurent Destailleur
fa64be5e82 Fix wrong number of td 2022-09-09 00:29:45 +02:00
UT from dolibit
32f5642156
Update transfer.php 2022-09-08 20:43:26 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Frédéric FRANCE
5b213b2b1a
doc 2022-09-08 15:18:52 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5 Clean code 2022-09-08 15:05:51 +02:00
Frédéric France
835441d437 remove blank line 2022-09-07 20:14:49 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
8f2a66cc44
Merge pull request #22078 from grandoc/fix_for_fichinter 
fix : extrafields of line where missing when cloning a fichinter
 2022-09-07 14:03:38 +02:00
Laurent Destailleur
6b7e11dbdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-07 13:59:12 +02:00
Laurent Destailleur
aa560db06d Fix regression 2022-09-07 13:58:24 +02:00
Laurent Destailleur
32b6ade70a
Merge pull request #22092 from aspangaro/16p9 
FIX #22057 Missing class AccountingAccount on clientfourn
 2022-09-07 13:12:26 +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
8c3c16dbe1
Merge pull request #22109 from dolibit-ut/patch-522 
Update bilan.php
 2022-09-07 13:07:10 +02:00
Laurent Destailleur
cd3164f3f0
Merge pull request #22111 from dolibit-ut/patch-524 
Update supplier_turnover_by_thirdparty.php
 2022-09-07 13:07:01 +02:00
Laurent Destailleur
7eb88e5151
Merge pull request #22108 from dolibit-ut/patch-521 
Update info.php
 2022-09-07 13:06:21 +02:00
Laurent Destailleur
f27a49d30c Fix missing var 2022-09-07 12:45:43 +02:00
This Charlène
0886f85579
Update card.php 2022-09-07 08:57:51 +02:00
This Charlène
bfb93609dd
php V8 Warning 2022-09-07 08:56:02 +02:00
UT from dolibit
079dab3a2c
Update supplier_turnover_by_thirdparty.php 2022-09-06 18:37:03 +02:00
UT from dolibit
86377a337e
Update categ.php 2022-09-06 18:30:10 +02:00
UT from dolibit
ee799693b1
Update bilan.php 2022-09-06 18:27:07 +02:00
UT from dolibit
3cebf6767e
Update info.php 2022-09-06 18:24:26 +02:00
Philippe GRAND
3a5abf12bc update code 2022-09-06 16:40:07 +02:00
Alexandre SPANGARO
a13f232d2d FIX #22057 2022-09-06 05:42:04 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
9959aa9701 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-05 18:33:42 +02:00
Laurent Destailleur
3e9df092f4 css 2022-09-05 09:15:45 +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
9693587780
Merge pull request #21966 from dolibit-ut/patch-477 
Update index.php
 2022-09-03 11:44:51 +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
Laurent Destailleur
83bb78f981
Merge pull request #22045 from frederic34/pr/grandoc/22009 
Pr/grandoc/22009
 2022-09-03 11:39:39 +02:00
Laurent Destailleur
a67008f7e9
Merge pull request #22058 from grandoc/16.0 
FIX : bug#22057
 2022-09-03 11:38:36 +02:00
Philippe GRAND
5a98b72faf Update code 2022-09-03 11:14:05 +02:00
Philippe GRAND
7c04468246 fix bug#22057 2022-09-03 10:36:54 +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
Alexandre SPANGARO
16e1c7ea71
Update result.php 
Fixed Stickler
 2022-09-02 10:25:12 +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
Thomas Negre
ce78e0164a Fix: When a custom compta group would be unactive, its code would stay in the computed formula. This would lead to wrong totals if the code is a number. 2022-09-01 17:49:05 +02:00
Thomas Negre
30ce816c0c Fix: On a not configured personalized accounting group, the group code would be used in the formula. 2022-09-01 17:49:04 +02:00
Philippe GRAND
52bc56bc25 update code 2022-09-01 09:42:58 +02:00
Sylvain Legrand
52a80a5fe4
Update card.php 2022-09-01 08:44:49 +02:00
Sylvain Legrand
a1bae3453a Add an option to manage input size for customer / supplier references 2022-09-01 08:34:22 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
8a73872130 update code 2022-08-31 22:05:44 +02:00
Philippe GRAND
d44a75d7c9 update code 2022-08-31 22:05:18 +02:00
Philippe GRAND
b0ec6adf6b update code 2022-08-31 22:04:45 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Philippe GRAND
fd707eede1 update code 2022-08-31 22:01:21 +02:00
Philippe GRAND
b5b9871c11 update code 2022-08-31 22:00:12 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +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
Laurent Destailleur
594bbcb1f1 Fix regression 2022-08-31 17:32:38 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-30 19:38:35 +02:00
UT from dolibit
a8d480ee2d
Update index.php 2022-08-29 18:55:02 +02:00
Alexandre SPANGARO
6d5bb21fa9 Use isModEnabled 2022-08-29 12:05:10 +02:00
Alexandre SPANGARO
6ef4987766 Use isModEnabled 2022-08-29 12:05:03 +02:00
Alexandre SPANGARO
a1bb835074 Use isModEnabled 2022-08-29 12:04:54 +02:00
Alexandre SPANGARO
732d1e4e40 Use isModEnabled 2022-08-29 12:04:47 +02:00
Alexandre SPANGARO
355286e50a Use isModEnabled 2022-08-29 12:04:39 +02:00
Alexandre SPANGARO
0012c75ff3 Use isModEnabled 2022-08-29 12:04:03 +02:00
Alexandre SPANGARO
5dc2230c88 Use isModEnabled 2022-08-29 12:03:32 +02:00
Alexandre SPANGARO
34e036ab1c Use isModEnabled 2022-08-29 12:03:25 +02:00
Alexandre SPANGARO
8cf4663c58 Use isModEnabled 2022-08-29 12:03:19 +02:00
Alexandre SPANGARO
e6fb17c909 Use isModEnabled 2022-08-29 12:03:10 +02:00
Alexandre SPANGARO
2c9047661e Use isModEnabled 2022-08-29 12:03:05 +02:00
Alexandre SPANGARO
9dec4c9042 Use isModEnabled 2022-08-29 12:02:55 +02:00
Alexandre SPANGARO
0d3cae8ee8 Use isModEnabled 2022-08-29 12:02:49 +02:00
Alexandre SPANGARO
ae449dfe0f Use isModEnabled 2022-08-29 12:01:36 +02:00
Alexandre SPANGARO
bdd2d23bf1 Use isModEnabled 2022-08-29 11:58:55 +02:00
Alexandre SPANGARO
52ab81f779 Use isModEnabled 2022-08-29 11:58:34 +02:00
Alexandre SPANGARO
d903d2bfd8 Use isModEnabled 2022-08-29 11:58:27 +02:00
Alexandre SPANGARO
7ea4f11a99 Use isModEnabled 2022-08-29 11:57:59 +02:00
Alexandre SPANGARO
de21556fbc Use isModEnabled 2022-08-29 11:57:45 +02:00
Alexandre SPANGARO
3457020ee6 Use isModEnabled 2022-08-29 11:57:30 +02:00
Alexandre SPANGARO
8c3bd15765 Use isModEnabled 2022-08-29 11:56:35 +02:00
Alexandre SPANGARO
ed7f45bdd3 Use isModEnabled 2022-08-29 11:56:25 +02:00
Alexandre SPANGARO
94e4144c27 Use isModEnabled 2022-08-29 11:56:02 +02:00
Alexandre SPANGARO
ca3f592875 Use isModEnabled 2022-08-29 11:35:17 +02:00
Alexandre SPANGARO
f8f9b3fa4d Use isModEnabled 2022-08-29 11:35:12 +02:00
Alexandre SPANGARO
85571fee42 Use isModEnabled 2022-08-29 11:35:08 +02:00
Alexandre SPANGARO
b3f3eb1eeb Use isModEnabled 2022-08-29 11:35:04 +02:00
Alexandre SPANGARO
6ae73e72e5 Use isModEnabled 2022-08-29 11:35:00 +02:00
Alexandre SPANGARO
b1514af198 Use isModEnabled 2022-08-29 11:34:56 +02:00
Alexandre SPANGARO
5b810db990 Use isModEnabled 2022-08-29 11:34:49 +02:00
Alexandre SPANGARO
e2af7238f4 Use isModEnabled 2022-08-29 11:34:44 +02:00
Alexandre SPANGARO
ebff140389 Use isModEnabled 2022-08-29 11:34:29 +02:00
Alexandre SPANGARO
a2fe675ead Use isModEnabled 2022-08-29 11:34:24 +02:00
Alexandre SPANGARO
2b706c7a60 Use isModEnabled 2022-08-29 11:34:18 +02:00
Alexandre SPANGARO
0b362424e5 Use isModEnabled 2022-08-29 11:34:14 +02:00
Alexandre SPANGARO
8b76277779 Use isModEnabled 2022-08-29 11:34:07 +02:00
Alexandre SPANGARO
03f3ff9134 Use isModEnabled 2022-08-29 11:34:00 +02:00
Alexandre SPANGARO
ed0b8d5155 Use isModEnabled 2022-08-29 11:33:55 +02:00
Alexandre SPANGARO
6715d379d5 Use isModEnabled 2022-08-29 11:33:47 +02:00
Alexandre SPANGARO
08bbe33379 Use isModEnabled 2022-08-29 11:29:17 +02:00
Alexandre SPANGARO
ebba133880 Use isModEnabled 2022-08-29 11:27:48 +02:00
Alexandre SPANGARO
3ccb87e1fb Use isModEnabled 2022-08-29 11:27:44 +02:00
Alexandre SPANGARO
dd7dece5e8 Use isModEnabled 2022-08-29 11:27:40 +02:00
Alexandre SPANGARO
cb7728936a Use isModEnabled 2022-08-29 11:26:40 +02:00
Alexandre SPANGARO
07e91a061a Use isModEnabled 2022-08-29 11:26:32 +02:00
Alexandre SPANGARO
768f6416ab Use isModEnabled 2022-08-29 11:26:26 +02:00
Alexandre SPANGARO
9019604885 Use isModEnabled 2022-08-29 11:26:18 +02:00
Alexandre SPANGARO
22d754d43c Use isModEnabled 2022-08-29 11:25:50 +02:00
Alexandre SPANGARO
1ea5b984b2 Use isModEnabled 2022-08-29 11:25:44 +02:00
Alexandre SPANGARO
cb54db77e8 Use isModEnabled 2022-08-29 11:25:37 +02:00
Alexandre SPANGARO
e9dccee7c2 Use isModEnabled 2022-08-29 11:25:30 +02:00
Alexandre SPANGARO
a283ab61c2 Use isModEnabled 2022-08-29 11:25:24 +02:00
Alexandre SPANGARO
38882a6324 Use isModEnabled 2022-08-29 11:25:20 +02:00
Alexandre SPANGARO
ef3b8b3b31 Use isModEnabled 2022-08-29 11:25:14 +02:00
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
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
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +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
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +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
Florian HENRY
902301659b finish invoice per product per line 2022-04-13 09:31:30 +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
Ferran Marcet
f8b457e61c Merge branch '15.0up' into 15.0 2022-03-30 09:34:28 +02:00
Ferran Marcet
dd20907d53 Fix: Sales representative column crash on invoice list 2022-03-30 09:33:14 +02:00
Laurent Destailleur
8eeb6f3c8d
Merge pull request #20315 from atm-steve/FIX_Facture_dolGetButtonAction 
Fix: Facture dolGetButtonAction
 2022-03-29 21:11:24 +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
Laurent Destailleur
d75483552d Responsive 2022-03-26 15:48:36 +01: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
Gauthier PC portable 024
fdf8a3f4ad FIX : comment 2022-03-25 16:43:54 +01:00
Gauthier PC portable 024
ab2e6ddf43 FIX : forgotten form confirm before various payment delete 2022-03-25 16:41: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
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
9747efe050 Fix phpcs 2022-03-24 14:09:46 +01:00
Thomas Negre
6dfad5d69f facture/card.php: replace redirection by = '' 2022-03-24 11:09:39 +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
Laurent Destailleur
161e795759 Look and feel 2022-03-23 17:12:25 +01:00
Laurent Destailleur
0e3fa3cdc3
Merge pull request #20420 from defrance/patch-180 
NEW : add hook for more buttons
 2022-03-23 15:54:13 +01:00
Laurent Destailleur
2943e68c42 Fix regression 2022-03-22 16:57:39 +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
BENKE Charlene
5fd2ec3fda
add hook for more buttons 2022-03-21 15:43:37 +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
Laurent Destailleur
a970f78c4e css 2022-03-17 21:34:14 +01:00
ATM john
53f4fd2af8 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_regression_selct_extrafield_search 2022-03-16 10:44:15 +01:00
ATM john
5e644ed0a4 Fix search degradation 2022-03-15 18:24:49 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Laurent Destailleur
38c77b00a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-13 22:19:14 +01:00
Laurent Destailleur
2367f0d030 Fix missing badge 2022-03-13 18:39:45 +01:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
Laurent Destailleur
8410298c7e Fix access to the bank receipt view 2022-03-12 18:23:06 +01:00
Laurent Destailleur
a2b880bdbf Fix access to the bank receipt view 2022-03-12 18:20:15 +01:00
Laurent Destailleur
961636ea35 CSS 2022-03-12 16:04:00 +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
steve
c3b22ed26e wip: clean comments 2022-03-09 17:10:53 +01:00
steve
25fcb83b74 wip: reopen button 2022-03-09 16:41:26 +01:00
Steve
dcf5d984b0 Merge branch 'dolibarrdevelop' into WIP_Facture_dolGetButtonAction 2022-03-09 11:49:34 +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
7c866ce6a2 facture/card.php: avoid validating invoices with date anterior to last invoice date 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
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23: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
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Laurent Destailleur
6bb49797f8
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo 
Fix: typo in template name
 2022-03-07 14:55:02 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
steve
665e401564 wip: replace butAction 2022-03-04 17:03:40 +01:00
Gauthier PC portable 024
7701ae2d19 FIX : in case of TVA refund, negative amount must be allowed 2022-03-04 13:55:52 +01:00
John Livingston
1ece554c92
Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
 2022-02-28 22:30:17 +01:00
Laurent Destailleur
c1268a3e39
Merge pull request #20151 from aspangaro/14p34 
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
 2022-02-28 21:38:07 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
5a24552930 Fix doc 2022-02-28 20:03:21 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00
Regis Houssin
9cf5bccf43 FIX options should not exists on invoices 2022-02-28 18:13:29 +01:00
Laurent Destailleur
aff7148ed8 Fix missing error management 2022-02-28 16:39:42 +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
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
Alexandre SPANGARO
18a8eac1cd Modify fix 2022-02-26 07:17:44 +01:00
Laurent Destailleur
adb4af7099 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:39:34 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
Laurent Destailleur
7d6cbe0800
Merge pull request #20173 from thomas-Ngr/develop_new_SEPA_PmtTpInf_CdtTrfTxInf 
NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
 2022-02-25 13:48:32 +01:00
stickler-ci
a0bc41cdba Fixing style errors. 2022-02-24 14:32:59 +00:00
Gauthier PC portable 024
517562b465 NEW : solde() function evolution to be able to get solde until a chosen date 2022-02-24 15:26:11 +01:00
Thomas Negre
7c29b2421d only display SEPA XML option at account creation if module payment by bank transfer is enabled 2022-02-24 09:52:41 +01:00
Thomas Negre
83ed380e6b display XML SEPA config option only if 'payment by bank transfer' module is enabled 2022-02-23 16:36:57 +01:00
Thomas Negre
af4e1667e0 Payment by bank transfer: create optionnaly place payment type information (PmtTpInf) in credit transfer transaction information (CdtTrfTxInf) 
- introduce PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY const
 2022-02-23 16:23:25 +01:00
Thomas Negre
7a13112ad8 bank card interface modification to allow configuration of payment type information in SEPA XML 2022-02-23 16:22:37 +01:00
Thomas Negre
6136de6a4a add 'pti_in_ctti' property for Account object. Update related methods. 2022-02-23 16:22:19 +01:00
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Alexandre SPANGARO
0510d84263 FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card 2022-02-23 06:08:20 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +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
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
bd58cf1b37 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-18 21:52:18 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Laurent Destailleur
28d8a28be6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:45:54 +01:00
Laurent Destailleur
959aa0ce59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-18 21:44:34 +01:00
Laurent Destailleur
f295fa8ad4
Merge pull request #20108 from atm-maxime/fix_15_missing_hooks 
Fix : add missing formobjectoptions hook on 3 cards
 2022-02-18 20:23:09 +01:00
Laurent Destailleur
0517e2e2d3 Fix error 2022-02-18 18:35:21 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Maxime Kohlhaas
7a457478d5 Fix : add missing formobjectoptions hook on 3 cards 2022-02-18 08:23:12 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
f1d84f5728
Merge pull request #20060 from hregis/fix_missing_default_or_current_value 
FIX missing default or current value
 2022-02-17 19:43:29 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
ea4eed31f5
Merge pull request #20066 from javieralapps4up/develop 
FIX Andorra needs Code Banque
 2022-02-16 20:38:26 +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
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity 
add missing entity check on list of withdraws on index of paymentbyba…
 2022-02-16 20:26:39 +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
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert 
manage details of prelevment line for bank transfer
 2022-02-16 20:22:54 +01:00
lvessiller
7e17167faf NEW total mark rate in list 2022-02-16 11:45:29 +01:00
Alexis LAURIER
ff8dcdc4b7 manage details of prelevment line for bank transfer 2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +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
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
d546e11fba
Update chargesociales.class.php 2022-02-15 17:13:08 +01:00
Christophe Battarel
ebada46a07 fix context for createfromclone 2022-02-15 12:14:48 +01:00
Frédéric FRANCE
502aa1b14b
Update paiement.class.php 2022-02-15 11:21:40 +01:00
Frédéric FRANCE
710e970389
Update facture-rec.class.php 2022-02-15 11:13:22 +01:00
Christophe Battarel
01ef9b64ee fix parent line on create with no originid 2022-02-15 10:34:10 +01:00
Christophe Battarel
6c6c854eae fix parent line on create with origin 2022-02-15 10:23:43 +01:00
javieralapps4up
81c2631b00
FIX Andorra needs Code Banque 2022-02-14 20:06:42 +01:00
Regis Houssin
15b7f37027 FIX missing default or current value 2022-02-14 09:14:06 +01:00
Quentin VIAL-GOUTEYRON
d819d427c3 FIX sort amount ht 2022-02-10 16:46:19 +01:00
Laurent Destailleur
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
10d2e0cec0 Fix link to reconcile 2022-02-10 16:27:40 +01:00
Laurent Destailleur
b69beb98b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:30:22 +01:00
Laurent Destailleur
c4c15fc105 Fix warnings 2022-02-10 13:16:51 +01:00
Laurent Destailleur
ff3fbd1cf8 Fix preselected field 2022-02-10 13:06:51 +01:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
1d6a7ebe03 Fix pb with bulk payment feature 2022-02-10 13:01:47 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
 2022-02-10 10:23:42 +01:00
Regis Houssin
3eabeb2380 FIX broken feature, wrong div name again 2022-02-10 10:18:06 +01:00
Laurent Destailleur
d5d34930a8
Update card.php 2022-02-10 09:58:08 +01:00
Regis Houssin
8dffa020b4 FIX broken feature, wrong div name 2022-02-10 09:54:09 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
02ec11ff64 css 2022-02-07 15:07:03 +01:00
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Laurent Destailleur
ba77700619 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 17:58:09 +01:00
Laurent Destailleur
e813de1595 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:54 +01:00
Laurent Destailleur
5a89da8876 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:19 +01:00