lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

90157 Commits

Author SHA1 Message Date
Alexandre SPANGARO
af843ed82c Merge branch '14.0' into 14p10 2021-08-20 22:11:42 +02:00
Alexandre SPANGARO
53af4b0076 FIX #18375 SQL Error on tasks statistics 2021-08-20 22:11:26 +02:00
Alexandre SPANGARO
8bdf58b942 FIX #18353 Invoice list translation issue 2021-08-20 21:42:43 +02:00
Laurent Destailleur
35e48f3a27 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-08-20 21:12:22 +02:00
Laurent Destailleur
9d285ea232 Fix: Can delete a price when date is in future to fix corrupted data 2021-08-20 21:11:20 +02:00
Frédéric FRANCE
e93dbcd0c0
make public url more readable 2021-08-20 14:47:51 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
335e1ff405 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-20 12:45:37 +02:00
Laurent Destailleur
10ddd621ca Fix escape error message 2021-08-20 12:40:49 +02:00
Anthony Berton
019241e3d4 Merge branch 'PDF_Ref_In_Title' of https://github.com/bb2a/dolibarr into PDF_Ref_In_Title 2021-08-19 18:17:10 +02:00
Anthony Berton
f50842cdef cop 2021-08-19 18:16:58 +02:00
stickler-ci
c750c5f7cf Fixing style errors. 2021-08-19 14:45:55 +00:00
Anthony Berton
58b50d02c7 default ref in title 2 2021-08-19 16:43:35 +02:00
Anthony Berton
10c445cf6a default ref in title 2021-08-19 16:13:41 +02:00
Laurent Destailleur
03d2d24244 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-19 16:12:26 +02:00
Laurent Destailleur
e1dc5b5188 css 2021-08-19 16:12:13 +02:00
Laurent Destailleur
91792e3c0e
Merge pull request #18441 from KlaasOl/patch-4 
Update main.lang
 2021-08-19 13:48:12 +02:00
Laurent Destailleur
3ee4a6556a
Merge branch 'develop' into undefined 2021-08-19 13:43:32 +02:00
stickler-ci
172b672437 Fixing style errors. 2021-08-19 10:19:25 +00:00
Gurvan Kervern
476dfc289e
Update index.php 2021-08-19 18:16:47 +08:00
Erik van Berkum
e570c22398 Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1. 2021-08-19 17:09:18 +09:00
Florian HENRY
223637317b fix: missing tocken CRCSF 2021-08-19 09:51:09 +02:00
Klaas Oldenburger
0d4badb50b
Update main.lang 
Change date format to Dutch standards
 2021-08-19 08:26:37 +02:00
Alexandre SPANGARO
954676b04b NEW Contract - Add From/to input on search date 2021-08-19 04:47:08 +02:00
Laurent Destailleur
eb70cb2ecc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-19 02:49:24 +02:00
Alexandre SPANGARO
797372cac2 NEW Supplier order - Add From/to input on search date 2021-08-18 22:30:33 +02:00
Gurvan Kervern
4d20ba2e4e
Update services_list.php 2021-08-19 04:29:09 +08:00
Laurent Destailleur
e0f8a87129 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-18 22:15:39 +02:00
Laurent Destailleur
60c9a882f1 Code comment 2021-08-18 22:15:20 +02:00
Laurent Destailleur
7af265db8a
Update card.php 2021-08-18 22:03:16 +02:00
Laurent Destailleur
1df2aeb233
Update card.php 2021-08-18 22:01:53 +02:00
Laurent Destailleur
c9128fa59c
Merge pull request #18436 from aspangaro/15a3 
NEW Supplier proposal - Add From/to input on search date
 2021-08-18 22:00:23 +02:00
Alexandre SPANGARO
c03b71dff3 NEW Supplier proposal - Add From/to input on search date 2021-08-18 21:41:11 +02:00
Laurent Destailleur
79f9b30f29
Merge pull request #18409 from vincentjdc/product-generate-ref-after-form 
NEW : Allows product ref generation after the form is validated with PRODUCT_GENERATE_REF_AFTER_FORM
 2021-08-18 21:32:35 +02:00
Laurent Destailleur
fa3ba05a23
Update card.php 2021-08-18 21:31:54 +02:00
Laurent Destailleur
cec94b5f33
Merge pull request #18433 from aspangaro/15a2 
NEW Ihm admin - Add tabs
 2021-08-18 21:30:41 +02:00
Laurent Destailleur
c2bfc87c34
Merge pull request #18435 from henrynopo/patch-2 
Added China into the list of country using State / province in address
 2021-08-18 21:28:16 +02:00
Laurent Destailleur
13e64d2f79 Fix replace file_get_contents with getURLContent 2021-08-18 19:46:37 +02:00
Laurent Destailleur
ee6a2f73db css install 2021-08-18 19:32:07 +02:00
Laurent Destailleur
e4aafcf91e Code comment 2021-08-18 18:43:33 +02:00
henrynopo
526ea1a9b3
Added China into the list of country using State / province in address 2021-08-18 22:30:28 +08:00
stickler-ci
88b0408e42 Fixing style errors. 2021-08-18 13:57:19 +00:00
Gurvan Kervern
ab95c5f463
Update index.php 2021-08-18 21:55:00 +08:00
Gurvan Kervern
2d35106e0b
Update card.php 2021-08-18 17:52:21 +08:00
Gurvan Kervern
3cde9a27ab
Update list.php 2021-08-18 17:50:10 +08:00
Gurvan Kervern
66495f3a9d
Update services_list.php 2021-08-18 17:47:59 +08:00
Gurvan Kervern
9253034007
Update list.php 2021-08-18 17:43:45 +08:00
stickler-ci
b51ac49f90 Fixing style errors. 2021-08-18 07:15:05 +00:00
vincentjdc
dc037083ae
Merge branch 'develop' into product-generate-ref-after-form 2021-08-18 09:13:01 +02:00
Anthony Berton
fcdb4bfafb
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-18 08:43:20 +02:00
stickler-ci
062e665874 Fixing style errors. 2021-08-18 02:45:29 +00:00
Alexandre SPANGARO
73dc98ed82 NEW Ihm admin - Add tabs 2021-08-18 04:36:37 +02:00
Laurent Destailleur
ae3a0fce71 Fix phpcs 2021-08-18 02:16:30 +02:00
Laurent Destailleur
b95b233c4b Position of fields 2021-08-18 02:07:48 +02:00
Laurent Destailleur
82db3ae1a9 NEW Use lang selector when using a field key 'lang' in modulebuilder 2021-08-18 01:54:13 +02:00
Laurent Destailleur
3bc8a7345c
Merge branch 'develop' into develop#1 2021-08-18 00:37:23 +02:00
Laurent Destailleur
04ce50c6f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-18 00:15:05 +02:00
Laurent Destailleur
4d9fc36ff2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-18 00:14:55 +02:00
Laurent Destailleur
57c9649b50 FIX bad approver shown on holiday once approved 2021-08-18 00:12:25 +02:00
Laurent Destailleur
33b9787ea1 Clean code 2021-08-18 00:10:48 +02:00
Laurent Destailleur
da3fb82868
Merge pull request #18175 from defrance/patch-170 
FIX : "disabled" field missing on definition
 2021-08-17 23:34:34 +02:00
Laurent Destailleur
c001fb9555 Clean code 2021-08-17 23:23:15 +02:00
Laurent Destailleur
bbcea38793 Fix phpcs 2021-08-17 21:58:06 +02:00
Alexandre SPANGARO
a7cb9b2143 NEW Ihm admin - Add tabs 2021-08-17 21:29:15 +02:00
Laurent Destailleur
1ff6c33276
Merge pull request #17537 from kastoras/create_share_on_file_upload_with_other_setup 
New Add option MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE to share file on any file upload
 2021-08-17 20:11:54 +02:00
stickler-ci
5d0318c98f Fixing style errors. 2021-08-17 18:11:12 +00:00
Laurent Destailleur
659f24efa9
Update files.lib.php 2021-08-17 20:10:47 +02:00
Laurent Destailleur
9521a9e77f Clean code 2021-08-17 20:02:19 +02:00
Laurent Destailleur
aee291d079
Merge pull request #17865 from ATM-Consulting/NEW_develop_autocomplete_accounting_account_groups 
New develop autocomplete accounting account groups
 2021-08-17 19:46:46 +02:00
Laurent Destailleur
dafb3b5029
Update global.inc.php 2021-08-17 19:41:42 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object 2021-08-17 19:35:36 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
2a19c02f19
Merge pull request #18178 from defrance/patch-171 
PHP V8 warning error, use of not declared array
 2021-08-17 19:29:49 +02:00
Laurent Destailleur
f0f8210918
Update DolibarrModules.class.php 2021-08-17 19:28:26 +02:00
Laurent Destailleur
35ebaf7b79
Merge pull request #18282 from aspangaro/12p18 
FIX: Manage credit note on situation invoice for calculate margin
 2021-08-17 19:26:16 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2 
Close #18302 : Mass action leave requests aproval
 2021-08-17 19:23:30 +02:00
Laurent Destailleur
cbdf121215
Merge branch 'develop' into dev_2 2021-08-17 19:20:42 +02:00
Laurent Destailleur
4f29a01da4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 19:12:21 +02:00
Laurent Destailleur
e264163ab6 Fix phpcs 2021-08-17 19:11:48 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice 
NEW : mass action paid customer invoice
 2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php 2021-08-17 19:08:55 +02:00
Laurent Destailleur
f38b9eb1c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 19:02:29 +02:00
Laurent Destailleur
47b4fd3769 Complete migration 2021-08-17 19:02:16 +02:00
Laurent Destailleur
b96dd7a796
Merge branch 'develop' into patch-422 2021-08-17 19:00:46 +02:00
Laurent Destailleur
0858487119 Fix #18343 2021-08-17 18:52:33 +02:00
Laurent Destailleur
a19f8cd87d
Merge pull request #18337 from atm-maxime/fix_holidays_users 
Fix : we only want employee users for holidays
 2021-08-17 18:37:38 +02:00
Laurent Destailleur
ec2df3b282
Update pdf.php 2021-08-17 18:33:10 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-17 18:30:37 +02:00
Laurent Destailleur
16c290f735
Merge pull request #18383 from marc-dll/12.0_FIX_invoice_tiny_negative_vat 
FIX: invoice validation: when checking if any VAT rate has a negative amount, prevent false positives with -1.0E-14 amounts
 2021-08-17 18:24:33 +02:00
Laurent Destailleur
d09c2de6a8 Better position of options 2021-08-17 18:18:08 +02:00
Laurent Destailleur
33697cec1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-17 18:13:18 +02:00
Laurent Destailleur
fb1e5f72d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:11:08 +02:00
Laurent Destailleur
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
 2021-08-17 18:07:10 +02:00
Laurent Destailleur
ceaaff0186 Sellby always before Eatby #18361 2021-08-17 18:05:34 +02:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Laurent Destailleur
d1858e02b5
Update card.php 2021-08-17 17:03:41 +02:00
Laurent Destailleur
d4c35edef4
Update pdf.php 2021-08-17 16:55:56 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-17 16:46:06 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name 2021-08-17 16:41:19 +02:00
Laurent Destailleur
6e7c8677eb
Update admin.lang 2021-08-17 16:40:31 +02:00
Laurent Destailleur
a0d82e6bf7
Merge pull request #18404 from lainwir3d/add_url_shipment_substitute 
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the shipment URL
 2021-08-17 16:36:09 +02:00
Laurent Destailleur
582bf1415e
Update functions.lib.php 2021-08-17 16:35:43 +02:00
Laurent Destailleur
2035499a34
Merge pull request #18402 from lainwir3d/add_newref_substitute 
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
 2021-08-17 16:34:11 +02:00
Laurent Destailleur
3e5deeadf4
Merge pull request #18406 from vincentjdc/supplier-order-hide-product-label 
NEW : Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
 2021-08-17 16:24:19 +02:00
Laurent Destailleur
284207aeb3
Merge pull request #18429 from atm-quentin/NEW_hook_after_rank_update 
NEW hook after rank update
 2021-08-17 16:15:44 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php 2021-08-17 16:12:45 +02:00
Laurent Destailleur
59479a4c6e
Merge pull request #18405 from atm-gauthier/NEW/printFieldListFrom_on_several_lists 
NEW : printFieldListFrom hook call on several lists
 2021-08-17 15:58:28 +02:00
Laurent Destailleur
23e8b513c1
Merge pull request #18410 from ATM-Consulting/FIX_14.0_dolibarr_user_account_creation_from_recruitment_applicant_card 
FIX: e-mail of applicant is not transferred to the new user when creating a user from an applicant card
 2021-08-17 15:56:20 +02:00
Laurent Destailleur
46ca3ffd5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 15:50:46 +02:00
Laurent Destailleur
1a8ad5abfa Propagate $outputlangs to getExtrafieldContent method. 2021-08-17 15:50:28 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1 
Customer Invoice - Multicurrency Remaining to Pay
 2021-08-17 15:26:36 +02:00
Laurent Destailleur
e2424bda1e
Merge pull request #18419 from henrynopo/patch-2 
Supplier Invoice - Multicurrency remainder to pay
 2021-08-17 15:26:16 +02:00
Laurent Destailleur
8c093cfb31 Link to doc 2021-08-17 14:44:26 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
7d61609462 FIX #yogosha6907 2021-08-17 13:13:04 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf NEW hook after rank update 2021-08-17 09:33:50 +02:00
Laurent Destailleur
558c716931 Trans 2021-08-17 05:10:30 +02:00
Laurent Destailleur
88ccaeb13f Help setup 2021-08-17 05:08:15 +02:00
Laurent Destailleur
92d6ad9597 Removed old simple POS module ('cashdesk' module) 2021-08-17 04:57:53 +02:00
Laurent Destailleur
a31f991b39 Doc 2021-08-17 04:41:33 +02:00
Laurent Destailleur
30c40afeb3 Debug notification setup 2021-08-17 04:28:16 +02:00
Laurent Destailleur
a3d04163b6 Debug notification setup 2021-08-17 04:14:28 +02:00
Laurent Destailleur
7a3649b6e5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-17 03:21:13 +02:00
Laurent Destailleur
f51bcf0038 Debug notification module 2021-08-17 03:20:57 +02:00
Laurent Destailleur
cffa58a206
Merge pull request #18400 from lainwir3d/fix_notif_shipping_validate_email_template 
FIX #18399 Fix shipment validation email template override.
 2021-08-17 03:06:47 +02:00
Laurent Destailleur
cfbe2bf995
Merge pull request #18422 from aspangaro/14p13 
FIX Accountancy - SQL error on select journal on journal
 2021-08-17 02:41:56 +02:00
Laurent Destailleur
7207ae2cae Fix warning 2021-08-17 02:33:58 +02:00
Laurent Destailleur
ed250bb6a4
Merge pull request #18408 from atm-maxime/fix_suppinv_clone_lines 
Fix supplier invoice clone : missing data on lines (#18055)
 2021-08-17 02:18:36 +02:00
Laurent Destailleur
4b89a45ade Trans 2021-08-17 02:16:25 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
8927eeff50 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-17 02:11:36 +02:00
Laurent Destailleur
eba87ab295 FIX filter on status Draft in modulebuilder 2021-08-17 02:09:38 +02:00
Laurent Destailleur
15020c99e7
Update accountancyexport.class.php 2021-08-17 01:08:18 +02:00
Laurent Destailleur
9b43327af0
Update accountancyexport.class.php 2021-08-17 01:06:26 +02:00
Laurent Destailleur
091166baa7
Update accountancyexport.class.php 2021-08-17 01:03:07 +02:00
Laurent Destailleur
4efc96f67b
Merge pull request #18426 from aspangaro/14p14 
FIX Accountancy - SQL error when insert a manuel transaction
 2021-08-17 00:32:59 +02:00
Laurent Destailleur
7784c4fcc9
Update bookkeeping.class.php 2021-08-17 00:32:33 +02:00
Laurent Destailleur
9aab49e5c7 Fix bad closing tr 2021-08-16 23:03:33 +02:00
Laurent Destailleur
ecb673f15c Debug default BOM on product 2021-08-16 23:02:55 +02:00
Laurent Destailleur
baec6aa169 Optimize memory and perf for list of stock movements 2021-08-16 22:45:27 +02:00
Laurent Destailleur
23083427e8 NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:36:30 +02:00
Laurent Destailleur
a5df1d28d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-16 22:09:34 +02:00
Laurent Destailleur
06a0d922cc NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:01:58 +02:00
Alexandre SPANGARO
4b615e541b FIX Accountancy - SQL error when insert a manuel transaction 2021-08-16 21:29:28 +02:00
Laurent Destailleur
94fbcbdad1 CSS For support page 2021-08-16 20:22:50 +02:00
stickler-ci
af1f29bb16 Fixing style errors. 2021-08-16 11:22:49 +00:00
Gurvan Kervern
9f1ced1fd0 fix warnings 6 
Removing PHP8 warnings
 2021-08-16 19:06:38 +08:00
Gurvan Kervern
031e13d438 fix warnings 5 
Removing PHP8 warnings
 2021-08-16 18:55:49 +08:00
Gurvan Kervern
1bd7b4a439 fix warnings 4 
Fixing PHP8 warnings
 2021-08-16 18:52:44 +08:00
Gurvan Kervern
f9c4ea8f6a fix warnings3 
Fixing PHP8 warnings
 2021-08-16 18:37:39 +08:00
Gurvan Kervern
d2e2dcf27e fix warnings 2 
Fixing PHP8 warnings
 2021-08-16 18:10:04 +08:00
Gurvan Kervern
b0ea9fed0a fix warnings 1 
Removing all PHP8 warnings from error logs
 2021-08-16 18:05:29 +08:00
Alexandre SPANGARO
1bfc0004b1 Better fix 2021-08-16 08:12:24 +02:00
Alexandre SPANGARO
ba12071ea3 FIX Accountancy - SQL error on select journal on journal 2021-08-16 07:57:40 +02:00
Alexandre SPANGARO
b8da594c31 Better fix 2021-08-16 05:47:25 +02:00
stickler-ci
b92fe38bc0 Fixing style errors. 2021-08-16 01:47:49 +00:00
stickler-ci
ee65860b27 Fixing style errors. 2021-08-16 01:45:33 +00:00
henrynopo
76c39a86a0
Supplier Invoice - Multicurrency remainder to pay 
Added multicurrency remainder to be paid.
 2021-08-16 09:44:09 +08:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay 
Added the remainder to be paid in multicurrency mode.
 2021-08-16 09:39:09 +08:00
Alexandre SPANGARO
abc94a397a FIX #18389 Accountancy - Bug on LDcompta10 export for supplier invoice 2021-08-15 11:12:14 +02:00
Alexandre SPANGARO
f88abb9a6f Add parenthesis 2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
0d467972cd Merge branch '12.0' into 12p18 2021-08-15 07:19:33 +02:00
atm-florian
1932bc308d FIX: e-mail of applicant is not transferred to the new user when creating a user from an applicant card 2021-08-13 13:26:11 +02:00
Vincent Dieltiens
2aef13c3b4 Adds global variable 'PRODUCT_GENERATE_REF_AFTER_FORM' to allow product ref generation after the form validation 2021-08-13 11:38:48 +02:00
Maxime Kohlhaas
96a820476c Fix supplier invoice clone : missing data on lines (#18055) 2021-08-13 10:45:43 +02:00
Gauthier PC portable 024
b2dad4d2ce Merge branch 'NEW/printFieldListFrom_on_commande_list' of github.com:atm-gauthier/dolibarr into NEW/printFieldListFrom_on_several_lists 2021-08-12 15:44:20 +02:00
Gauthier PC portable 024
22eda3fd63 NEW : add missing printFieldListFrom hook call on several lists 2021-08-12 15:39:52 +02:00
lainwir3d
2125bc9aa5 CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment 2021-08-12 17:15:57 +04:00
lainwir3d
84b8717693 CLOSE #18401 Add __NEWREF__ subtitute to get new object reference. 
Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
 2021-08-12 17:05:00 +04:00
lainwir3d
cd60d09d9e FIX #18399 Fix shipment validation email template override. 
Object type name for shipment was apparently wrong.
 2021-08-12 16:16:45 +04:00
Vincent Dieltiens
e691217d00 Add a Global variable 'PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES' to have the possibility to hide product label in supplier order lines. 2021-08-12 13:56:41 +02:00
Laurent Destailleur
896cdf4845
Update list.php 2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist 2021-08-11 22:22:26 +02:00
Laurent Destailleur
0d07135027
Update list.php 2021-08-11 22:19:53 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
745af0f025 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 21:54:35 +02:00
Laurent Destailleur
d66df5cb60 Complete #15548 2021-08-11 21:53:21 +02:00
Laurent Destailleur
0d2e3ece1a
Update card.php 2021-08-11 21:50:28 +02:00
Laurent Destailleur
3af8e18b3c
Create card.php 2021-08-11 21:47:28 +02:00
stickler-ci
3c0601d1f9 Fixing style errors. 2021-08-11 19:46:39 +00:00
Laurent Destailleur
5b30cf3e77
Update card.php 2021-08-11 21:44:18 +02:00
Laurent Destailleur
c36bb0fbf7
Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
stickler-ci
eadfc9f4ae Fixing style errors. 2021-08-11 19:36:18 +00:00
Laurent Destailleur
3befe8f383
Update 12.0.0-13.0.0.sql 2021-08-11 21:34:11 +02:00
Laurent Destailleur
80673e0efc
Update card.php 2021-08-11 21:32:39 +02:00
Laurent Destailleur
9e54dc0dcb typo 2021-08-11 21:31:14 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2021-08-11 21:06:33 +02:00
Laurent Destailleur
bf72143823 Fix phpcs 2021-08-11 21:04:03 +02:00
Laurent Destailleur
911f8daec6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 21:03:04 +02:00
Laurent Destailleur
06b50051f1
Merge pull request #18356 from altairisfr/iban 
NEW: add constant MAIN_IBAN_IS_NEVER_MANDATORY
 2021-08-11 21:02:51 +02:00
Laurent Destailleur
012eee7e06
Merge pull request #18317 from altairisfr/PROPAL_NOT_BILLABLE 
NEW : add constant PROPOSAL_ARE_NOT_BILLABLE
 2021-08-11 21:00:53 +02:00
lmarcouiller
51a28a4ac4 Fix lang error on hrm/index.php 2021-08-11 20:48:22 +02:00
Laurent Destailleur
bfedd4a04c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 20:47:51 +02:00
Laurent Destailleur
ec4a1d4cb7
Merge pull request #18344 from Hystepik/develop#4 
Fix lang error on hrm/index.php
 2021-08-11 20:47:35 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close 
NEW #18326 Workflow: Close order on shipment closing.
 2021-08-11 20:47:06 +02:00
Laurent Destailleur
ab3874a203
Merge pull request #18349 from cfoellmann/fix-stdvalue-target 
add GETPOST to 'target' value on new bookmarks
 2021-08-11 20:05:36 +02:00
Laurent Destailleur
687eb536ae
Update card.php 2021-08-11 20:05:03 +02:00
Laurent Destailleur
8e9d0a567a
Merge pull request #18360 from andreubisquerra/develop 
NEW Customer Display with TakePOS
 2021-08-11 20:00:36 +02:00
Laurent Destailleur
366332a6f5
Merge pull request #18347 from erikvanberkum/develop 
Fix: Change French word to English in English array.
 2021-08-11 19:59:21 +02:00
Laurent Destailleur
dad251493a
Merge pull request #18355 from marc-dll/12.0_FIX_holiday_card_hooks 
FIX: holiday card: hooks uninitialized
 2021-08-11 19:58:50 +02:00
Laurent Destailleur
5a0adfc80b
Merge pull request #18362 from fappels/15_update_actioncomm 
Update actioncomm.class
 2021-08-11 19:58:25 +02:00
Laurent Destailleur
34b53592b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Anthony Berton
d421d3d8e3
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-11 18:39:32 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name 2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13 CHANGE_CONST_ADD_DOC 2021-08-11 18:37:13 +02:00
Anthony Berton
fb42e3f473 add_doc 2021-08-11 18:25:48 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-11 18:17:58 +02:00
Anthony Berton
a8562704cf add_doc 2021-08-11 18:16:53 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-11 18:12:02 +02:00
Anthony Berton
e89c1b49a8 add_espadon_doc 2021-08-11 17:44:40 +02:00
Anthony Berton
c62c53bf5e add_sponge_doc 2021-08-11 17:42:43 +02:00
Anthony Berton
fc10fd0901 add_cyan_doc 2021-08-11 17:32:09 +02:00
Anthony Berton
8d1a53ce98 add eratosthene doc 2021-08-11 16:28:13 +02:00
Anthony Berton
5938f131c8 erreur cut past logo height mouve 2021-08-11 16:24:11 +02:00
Anthony Berton
3b356fc366 params is duplicate 2021-08-11 16:20:41 +02:00
Anthony Berton
c5e8302ba2 Const 2021-08-11 16:18:16 +02:00
Laurent Destailleur
1cdab44252
Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine 
Remove strange check on hook printOriginObjectLine.
 2021-08-11 15:55:55 +02:00
Laurent Destailleur
8da328b183
Update extrafields_list_search_sql.tpl.php 2021-08-11 15:44:48 +02:00
Laurent Destailleur
dd5f2dd3a2
Merge pull request #18370 from cfoellmann/fix-link-supplier 
fix link to supplier card of thirdparty on supplier_order list
 2021-08-11 15:44:00 +02:00
Laurent Destailleur
3964bd28db
Merge pull request #18385 from marc-dll/12.0_FIX_workflow_shipment_validate_trigger 
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
 2021-08-11 15:28:12 +02:00
Laurent Destailleur
065d7a781e
Merge branch 'develop' into PDF_Add_propal_option_paiment 2021-08-11 15:24:10 +02:00
stickler-ci
775164f84a Fixing style errors. 2021-08-11 15:21:14 +02:00
Anthony Berton
c12905f0f3 ok 2021-08-11 15:21:08 +02:00
Laurent Destailleur
094a11fae6
Merge pull request #18390 from bb2a/save__pdf_option_other 
[FIX] PDF other options save Yes/No
 2021-08-11 15:19:38 +02:00
Laurent Destailleur
6fbd93999f css 2021-08-11 13:33:51 +02:00
stickler-ci
3e2b4b45c1 Fixing style errors. 2021-08-11 11:00:11 +00:00
Anthony Berton
40329b9181 other_doc 2021-08-11 12:59:34 +02:00
Anthony Berton
967d526307 other_frame 2021-08-11 12:41:50 +02:00
Anthony Berton
b8ccbf39f3 other_doc 2021-08-11 12:39:24 +02:00
stickler-ci
b7441aaf45 Fixing style errors. 2021-08-11 10:37:06 +00:00
Anthony Berton
b45a57060f const_and_other_doc 2021-08-11 12:36:16 +02:00
Anthony Berton
816648f283 other_docs 2021-08-11 12:28:44 +02:00
stickler-ci
120ac51495 Fixing style errors. 2021-08-11 06:52:10 +00:00
stickler-ci
8f8ff50d35 Fixing style errors. 2021-08-11 06:50:50 +00:00
Laurent Destailleur
f48a9aa3ad Optimize size of html 2021-08-10 19:44:55 +02:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Laurent Destailleur
4faf6f5d84 Fix crlf 2021-08-10 19:28:06 +02:00
Anthony Berton
7acc5e22d0 Merge branch 'PDF_show_sender_name' of https://github.com/bb2a/dolibarr into PDF_show_sender_name 2021-08-10 18:08:00 +02:00
Anthony Berton
be016197b4 Trans 2021-08-10 18:07:11 +02:00
Anthony Berton
bcb58ae6ef trans 2021-08-10 18:06:35 +02:00
Anthony Berton
2cb7e828a3 Trans 2021-08-10 18:05:58 +02:00
Anthony Berton
69e31e1655 ok 2021-08-10 18:04:59 +02:00
Anthony Berton
005e25375a ok 2021-08-10 17:51:39 +02:00
Gauthier PC portable 024
087e269103 FIX : on supplier order, JOIN with product fourn price table must be done with fk_soc too to avoid display several times a same line (because of same supplier product ref) 2021-08-10 17:34:47 +02:00
stickler-ci
1d9d90036d Fixing style errors. 2021-08-10 15:14:41 +00:00
Erik van Berkum
c05b1f5e29
Merge branch 'Dolibarr:develop' into develop 2021-08-10 23:59:50 +09:00
Laurent Destailleur
5e0aaeb6e4 Fix warning 2021-08-10 16:40:33 +02:00
Laurent Destailleur
2860c5e3ab Fix missing dir 2021-08-10 16:36:54 +02:00
Laurent Destailleur
bef0989b15 Missing declaration 2021-08-10 13:34:21 +02:00
Anthony Berton
fb81db9426 yes/no save 2021-08-10 13:34:12 +02:00
Anthony Berton
21d6b9834a yes/no save 2021-08-10 13:31:25 +02:00
Anthony Berton
133bb0e699 yes/no save 2021-08-10 13:28:36 +02:00
Anthony Berton
a5accb8c3c yes/no 2021-08-10 13:18:07 +02:00
Laurent Destailleur
31d6aaf6b4 FIX avoid to have link to create bookmar on page to create bookmark 2021-08-10 13:06:57 +02:00
Anthony Berton
6a41edd3c2 ok 2021-08-10 13:02:37 +02:00
Laurent Destailleur
6ece5f6931 FIX avoid to have link to create bookmar on page to create bookmark 2021-08-10 13:01:57 +02:00
Laurent Destailleur
93fb6bce71 css 2021-08-10 12:26:41 +02:00
Laurent Destailleur
3b73abed7c css 2021-08-10 11:40:25 +02:00
Marc de Lima Lucio
b610cc1c6c FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object 2021-08-10 11:18:25 +02:00
Marc de Lima Lucio
08f21e3fc4 FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts 2021-08-10 10:23:56 +02:00
Anthony Berton
366625f300 const 2021-08-10 09:50:14 +02:00
stickler-ci
fcd174f3ad Fixing style errors. 2021-08-10 07:45:47 +00:00
Anthony Berton
f8df845442 Const and Com 2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f const 2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152 CONST 2021-08-10 09:38:07 +02:00
Laurent Destailleur
f3dbe81df4 FIX Can't set cost price when product is not on purchase 2021-08-09 20:02:24 +02:00
Laurent Destailleur
6a9217474d FIX Can't set cost price when product is not on purchase 2021-08-09 20:01:06 +02:00
Laurent Destailleur
3f58e7c5db Debug status of partnership 2021-08-09 18:31:34 +02:00
Anthony Berton
0bead55836 ok 2021-08-09 18:11:36 +02:00
stickler-ci
adc6f883e2 Fixing style errors. 2021-08-09 16:03:13 +00:00
Anthony Berton
6b3b6fd508 ok 2021-08-09 18:01:43 +02:00
Laurent Destailleur
b5b53e382e Fix missing template 2021-08-09 18:01:41 +02:00
Laurent Destailleur
2c5e0a595b Fix init data missing 2021-08-09 17:58:08 +02:00
Laurent Destailleur
e91c5fc1c5 Clean code 2021-08-09 17:55:26 +02:00
Laurent Destailleur
0876cb4cd9 Fix button cancel 2021-08-09 17:46:36 +02:00
stickler-ci
190ae8377e Fixing style errors. 2021-08-09 15:42:38 +00:00
Anthony Berton
41457d2adb ok 2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
6e4fb8dd8b Fix debited instead of credited for bank transfer sepa status 2021-08-09 16:48:36 +02:00
Laurent Destailleur
739d8e1c6b Fix data structure 2021-08-09 16:19:23 +02:00
Laurent Destailleur
305314c04e Fix data structure 2021-08-09 16:18:33 +02:00
Laurent Destailleur
2de728c074 Fix trans 2021-08-09 16:12:20 +02:00
Christian Foellmann
e4cb1e023a fix link to supplier card of thirdparty on supplier_order list 2021-08-09 15:39:04 +02:00
Quentin VIAL-GOUTEYRON
108a5ff7cb FIX postgre filter select search extrafield 2021-08-09 15:14:25 +02:00
Francis Appels
91ef2a44fd Remove strange check on hook printOriginObjectLine. 
Now need reshook.
 2021-08-09 11:17:11 +02:00
andreubisquerra
ea531a4c88
Customer display settings 2021-08-08 19:16:11 +02:00
andreubisquerra
8a513ea468
Customer display on addline 2021-08-08 19:15:18 +02:00
andreubisquerra
bae5b39706
Customer display on click product 2021-08-08 19:14:28 +02:00
andreubisquerra
49b53e04f4
Customer Display total on pay 2021-08-08 19:13:31 +02:00
andreubisquerra
091f5ab23b
Customer Display Lang 2021-08-08 19:12:45 +02:00
Laurent Destailleur
6b1fc48bd0 Fix var not initialized 2021-08-08 18:22:09 +02:00
Laurent Destailleur
671baa261d Fix var not defined 2021-08-08 12:57:00 +02:00
Laurent Destailleur
029da815b2 Code comment 2021-08-08 12:35:52 +02:00
Laurent Destailleur
47d57b1ed2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-08 12:23:44 +02:00