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

6218 Commits

Author SHA1 Message Date
Laurent Destailleur
5eb4901b1f
Merge pull request #22231 from dolibit-ut/patch-597 
Update info.php
 2022-09-13 01:22:53 +02:00
Laurent Destailleur
16dce2001d
Merge pull request #22232 from dolibit-ut/patch-598 
Update index.php
 2022-09-13 01:18:29 +02:00
Laurent Destailleur
7e2d99c68f
Merge pull request #22233 from dolibit-ut/patch-599 
Update card.php
 2022-09-13 01:18:21 +02:00
Laurent Destailleur
a35d7f8a4b Fix must not overwrite the var that is an object of cache 2022-09-12 14:17:14 +02:00
Laurent Destailleur
f48752fc16 FIX inventory code must be different at each transation 2022-09-12 13:25:07 +02:00
Laurent Destailleur
95e1b97f42 Fix missing inventory code in reception 2022-09-12 13:09:21 +02:00
Laurent Destailleur
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
UT from dolibit
f47893bfd9
Update card.php 2022-09-12 10:12:27 +02:00
UT from dolibit
0a7d535f34
Update index.php 2022-09-12 10:08:04 +02:00
UT from dolibit
32ebee39ff
Update info.php 2022-09-12 10:04:48 +02:00
UT from dolibit
4d21d76644
Update list.php 2022-09-12 10:01:47 +02:00
UT from dolibit
472602121d
Update note.php 2022-09-12 09:57:58 +02:00
Laurent Destailleur
295b850ae8 Fix missing include 2022-09-11 22:25:03 +02:00
Laurent Destailleur
a11a33a804 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-11 22:21:18 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022 
update code
 2022-09-09 18:03:43 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Noé Courtier
ca8c650feb Fix: status of product suplier price was not recovered 2022-09-09 12:20:47 +02:00
Alexandre SPANGARO
9890965cfe rather center column title 2022-09-09 12:03:42 +02:00
Alexandre SPANGARO
f497306855 NEW : Supplier order list - Add column private and public note 2022-09-09 11:57:59 +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
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +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
Laurent Destailleur
4c09252650 Clean code 2022-09-08 12:29:46 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
lvessiller
6e6a62d167 NEW set payment default values when supplier order created from reception 2022-09-07 14:58:07 +02:00
Laurent Destailleur
9a2ef34af5
Merge pull request #22049 from aspangaro/17p4 
NEW Manage VAT on all lines on purchases cycle
 2022-09-07 14:07:31 +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
967e203319 Fix fetch missing fields 2022-09-07 13:55:02 +02:00
Laurent Destailleur
afd0df015e
Merge pull request #22084 from defrance/patch-241 
PHP V8 warning
 2022-09-07 13:48:25 +02:00
Laurent Destailleur
bb6e6084cc
Merge pull request #22113 from dolibit-ut/patch-526 
Update list.php
 2022-09-07 13:06:04 +02:00
Laurent Destailleur
c116842066
Merge pull request #22114 from dolibit-ut/patch-527 
Update card.php
 2022-09-07 13:05:44 +02:00
Laurent Destailleur
c8a299b097
Merge pull request #22115 from dolibit-ut/patch-528 
Update document.php
 2022-09-07 13:05:08 +02:00
Laurent Destailleur
d5edf9a69d
Merge pull request #22116 from dolibit-ut/patch-529 
Update info.php
 2022-09-07 13:04:41 +02:00
This Charlène
7a3b94a1e9
Update list.php 2022-09-07 09:53:43 +02:00
This Charlène
3144362c6c
php V8 warning 2022-09-07 09:38:20 +02:00
UT from dolibit
da61cb5b86
Update info.php 2022-09-06 21:34:30 +02:00
UT from dolibit
b4034c0a21
Update document.php 2022-09-06 21:30:09 +02:00
UT from dolibit
8973d7b2b5
Update card.php 2022-09-06 21:27:14 +02:00
UT from dolibit
17a4e20abb
Update list.php 2022-09-06 21:22:52 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
This Charlène
e1a1ce5551
php V8 warning 2022-09-05 17:31:30 +02:00
This Charlène
4262d666ca
PHP V8 warning 
and $objectidnext = $object->getIdReplacingInvoice(); not present
 2022-09-05 16:15:13 +02:00
Alexandre SPANGARO
61419fac68 Add permissions 2022-09-04 21:58:21 +02:00
Philippe GRAND
94a646103d update code 2022-09-04 13:32:12 +02:00
Philippe GRAND
4ecceb1fd0 update code 2022-09-04 13:30:34 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022 
Update code
 2022-09-03 11:44:36 +02:00
Philippe GRAND
62529b10e4 Update code 2022-09-03 11:28:48 +02:00
Philippe GRAND
3737a85470 Update code 2022-09-03 11:25:51 +02:00
stickler-ci
3883e66004 Fixing style errors. 2022-09-02 14:25:03 +00:00
Alexandre SPANGARO
38352d0c28 NEW Manage VAT on all lines on purchases cycle 2022-09-02 16:22: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
Philippe GRAND
fb1bfbf800 update code 2022-09-01 09:55:54 +02:00
Philippe GRAND
f5a50c828d update code 2022-09-01 09:55:19 +02:00
Philippe GRAND
0f74b04927 update code 2022-09-01 09:54:43 +02:00
Sylvain Legrand
a1bae3453a Add an option to manage input size for customer / supplier references 2022-09-01 08:34:22 +02:00
Philippe GRAND
3e37330669 update code 2022-08-31 22:38:21 +02:00
Philippe GRAND
7688a2429d update code 2022-08-31 22:37:55 +02:00
Philippe GRAND
ab71f47924 update code 2022-08-31 22:37:31 +02:00
Philippe GRAND
e283e867d8 update code 2022-08-31 22:37:04 +02:00
Philippe GRAND
218d5a774e update code 2022-08-31 22:36:39 +02:00
Philippe GRAND
a36491f4db update code 2022-08-31 22:36:15 +02:00
Philippe GRAND
29c7ebad27 update code 2022-08-31 22:35:45 +02:00
Philippe GRAND
b6b6ff4b6f update code 2022-08-31 22:35:08 +02:00
Philippe GRAND
6d826d718a update code 2022-08-31 22:33:53 +02:00
Philippe GRAND
75c1d28e1e update code 2022-08-31 22:33:30 +02:00
Philippe GRAND
0f4e9d1f85 update code 2022-08-31 22:33:07 +02:00
Philippe GRAND
e4521498c5 update code 2022-08-31 22:32:33 +02:00
Philippe GRAND
7af999df44 update code 2022-08-31 22:32:05 +02:00
Philippe GRAND
7af33751c6 update code 2022-08-31 22:31:39 +02:00
Philippe GRAND
bf6a2d4abe update code 2022-08-31 22:31:05 +02:00
Philippe GRAND
9438b71ebd update code 2022-08-31 22:30:46 +02:00
Philippe GRAND
adf50229d1 update code 2022-08-31 22:30:09 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
ece2f5553a fix php8 warnings 2022-08-31 21:49:10 +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
Francis Appels
aca6609f21 Close Remove trigger ORDER_SUPPLIER_DISPATCH #18486 2022-08-29 11:36:19 +02:00
Philippe GRAND
2b96fbaee6 FIX php8 compatibility 2022-08-28 14:13:03 +02:00
Laurent Destailleur
63a1daa091 Clean code 2022-08-26 19:27:38 +02:00
Laurent Destailleur
9cdcc08a4c
Merge pull request #21844 from defrance/patch-236 
php V8 warning on supplier order
 2022-08-25 17:44:44 +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
53e2bb994a
Merge branch 'develop' into patch-236 2022-08-25 13:48:28 +02:00
Laurent Destailleur
808a1e82b9
Merge pull request #21865 from fappels/16_best_buy_price_sharing 
FIX: Sharing of best buy price
 2022-08-24 18:06:55 +02:00
Francis Appels
7d6b46d856 HAR-19 Fix best buyprice sharing 2022-08-24 10:58:58 +02:00
Francis Appels
ce8489724e Merge remote-tracking branch 'Dolibarr/16.0' into 16_fix_warning_dispatch 2022-08-24 10:42:53 +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
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
stickler-ci
e4b7fbe1ac Fixing style errors. 2022-08-23 10:10:39 +00:00
This Charlène
9ce6ed74a7
Update fournisseur.commande.class.php 2022-08-23 12:05:54 +02:00
This Charlène
8c71118fa8
php V8 warning 2022-08-23 12:04:03 +02:00
Laurent Destailleur
e9b370e7c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-23 04:03:56 +02:00
Laurent Destailleur
7a66442cc4
Merge pull request #18284 from cfoellmann/fix-actionbuttons 
fix actionbuttons on editline or presend
 2022-08-23 01:49:56 +02:00
Laurent Destailleur
456c0f8dff
Merge pull request #21833 from defrance/patch-235 
php V8 warning (supplier order)
 2022-08-22 15:10:13 +02:00
This Charlène
5ddd0c20ae
php V8 warning 2022-08-22 13:57:23 +02:00
This Charlène
510b0c278c
php V8 warning 2022-08-22 13:49:01 +02:00
Laurent Destailleur
2b5205b639 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:05:22 +02:00
Laurent Destailleur
558ae00f66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/ajax/onlineSign.php
 2022-08-21 23:48:44 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
ksar
1d1228286c
FIX #21772 2022-08-17 09:45:27 +02:00
Laurent Destailleur
6a61c495b3 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-08-14 19:22:58 +02:00
Laurent Destailleur
35822d9431 css 2022-08-13 15:08: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
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Francis Appels
4167cca051 No need to set tmpproduct properties because fetched. 2022-08-11 18:26:18 +02:00
Francis Appels
251e0b1364 Fix dispatch - php warning on tmpproduct 2022-08-11 18:11:16 +02:00
Laurent Destailleur
a60a8d5057 sql error 2022-08-04 00:10:18 +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
Laurent Destailleur
4c4dd53385 Fix filter on company 2022-07-31 22:46:53 +02:00
This Charlène
7ff956a1e2
PHP V8 warning 2022-07-29 14:24:29 +02:00
Laurent Destailleur
f032a89c49
Merge pull request #21566 from FHenry/15_fix_21553 
fix: #21553, fourn prod Id is required to find packaging value
 2022-07-24 15:50:17 +02:00
Laurent Destailleur
2503b37bdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:33:55 +02:00
Laurent Destailleur
4b562121ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 14:33:02 +02:00
Florian HENRY
c342d0cde9 fix: display message only if change 2022-07-24 11:37:42 +02:00
Laurent Destailleur
336960453f
Merge pull request #21555 from FHenry/15_fix_message_only_when_updtae 
fix: display message only if change (with emballage on)
 2022-07-24 11:36:39 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
5358d88864 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 00:07:41 +02:00
Laurent Destailleur
8e1d80e294
Merge pull request #21564 from FHenry/15_fix_21553 
fix: #21553 fourn prod Id is required to find packaging value
 2022-07-24 00:01:40 +02:00
Laurent Destailleur
da519f3ab5 Fix bad constructor 2022-07-23 23:55:57 +02:00
Florian HENRY
3af167db6c fix: #21553, fourn prod Id is required to find emballage value 2022-07-23 13:54:07 +02:00
stickler-ci
42809c62d2 Fixing style errors. 2022-07-22 09:05:51 +00:00
This Charlène
bd0b28d30a
fix special_code PHP V8 by adding on addline fct 2022-07-22 11:00:06 +02:00
This Charlène
762cea2416
php V8 fix warning 2022-07-22 10:51:45 +02:00
Florian HENRY
0ee6e92dc0 fix: display message only if change 2022-07-22 10:51:28 +02:00
spooky360
5d75ea015b
Added "$object" parameter to $formfile->showdocuments call 
Added "$object" parameter to $formfile->showdocuments call in order to use the $object reference on the showDocuments hook called inside showdocuments function.
Otherwise, the hook is called with a null reference.
 2022-07-22 09:51:57 +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
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +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
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +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
cccb453a05 Fix doc 2022-07-10 18:40:53 +02:00
Laurent Destailleur
8f819abd61 Fix doc 2022-07-10 18:35:23 +02:00
Laurent Destailleur
9db3c1bbd6 Fix currency missing 2022-07-08 10:56:36 +02:00
Christian Foellmann
aeb86a4faf fix actionbuttons on editline or presend 2022-07-08 10:05:55 +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
33a65dd9b8
Merge pull request #21246 from Easya-Solutions/new-inventory-list-show-product-ref-with-label 
NEW show product label on inventory
 2022-07-07 22:08:06 +02:00
Laurent Destailleur
b7a99463a6
Merge pull request #21341 from fboitel/NEW#21000 
NEW #21000
 2022-07-07 22:06:59 +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
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
59816ce171 Fix scrutinizer 2022-07-06 03:08:30 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00
Laurent Destailleur
941245c5e2 Debug v16 2022-06-28 12:26:49 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
a1f974f356
Merge pull request #21374 from aspangaro/17p2 
Look & Feel v16 - Align amount to right on card
 2022-06-27 11:39:31 +02:00
Alexandre SPANGARO
c6a8242e76 Look & Feel v16 - Align amount to right on card 2022-06-25 07:09:24 +02:00
Laurent Destailleur
6ec17dbe79 Fix phpcs 2022-06-23 19:31:51 +02:00
Laurent Destailleur
b2603c9b53 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/fournisseurs.php
 2022-06-23 12:26:26 +02:00
Laurent Destailleur
c0240ae996 Merge 2022-06-23 12:24:34 +02:00
Laurent Destailleur
d60d296dd0 phpcs 2022-06-23 11:49:40 +02:00
Faustin
df8580dd4c NEW 21000 Added columns 'alias_name' on supplier invoice list 2022-06-21 19:50:05 +02:00
Faustin
0adc7116a6 NEW 21000 Added columns 'alias_name' on supplier order list 2022-06-21 19:21:50 +02:00
atm-lena
a94e39f0f4 Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into 14.0_FIX_productfournprice_saveextrafieldsvalues 2022-06-21 16:38:09 +02:00
atm-lena
d99adae850 Product Fourn Price : fix error save extrafields values 2022-06-21 16:34:23 +02:00
Laurent Destailleur
5ef2f1c69f Fix bad name of hook context 2022-06-20 13:48:06 +02:00
Laurent Destailleur
5c82e37517 Debug v16 2022-06-20 13:40:54 +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
lvessiller
61a9521e3c NEW Changelog and reorder getNomUrl parameters 2022-06-17 17:32:22 +02:00
Laurent Destailleur
603c7f0c39 Debug v16 2022-06-17 12:30:34 +02:00
lvessiller
813a87eb3c FIX resolve conflicts 2022-06-16 17:32:53 +02:00
Alexandre SPANGARO
a8e4aec5c2 Same modification on supplier invoice 2022-06-15 04:46:58 +02:00
Laurent Destailleur
0ab03ce787
Merge pull request #21266 from fboitel/fboitel-dev-scrutinizer-010 
BUG FIX Class PaiementFourn does not contain oper property anymore
 2022-06-14 20:54:46 +02:00
atm-florian
b4e068dcdc PR feedback: allow setting a specific hourtime 2022-06-14 18:13:32 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
b5f77b4035 FIX #21237 2022-06-14 17:36:42 +02:00
Faustin
6ea785a4e7 BUG FIX Class PaiementFourn does not contain oper property anymore 2022-06-14 13:37:15 +02:00
atm-florian
9ae40a2a02 NEW: helper functions for dates + small demo case 2022-06-14 12:52:14 +02:00
Laurent Destailleur
f261846990 Fix look and feel v16 2022-06-14 10:21:10 +02:00
lvessiller
dddd4186a8 NEW show product label on inventory 2022-06-13 15:37:43 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
0104f00a7a Debug v16 2022-06-09 11:12:45 +02:00
Laurent Destailleur
603201206a css 2022-06-02 12:35:38 +02:00
Laurent Destailleur
bc79f041dc Debug v16 2022-06-02 11:11:28 +02:00
Laurent Destailleur
6cab758841 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/knowledgemanagement/knowledgerecord_list.php
	htdocs/theme/md/style.css.php
 2022-06-01 21:55:36 +02:00
Laurent Destailleur
9efc1e2d36
Merge pull request #21064 from milenmk/develop 
Fix issue #21063
 2022-06-01 21:33:19 +02:00
Francis Appels
74346c6480 Fix sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled. 2022-05-31 16:59:57 +02:00
lmarcouiller
2d13b47441 fix php8.0 warnings 2022-05-31 11:36:54 +02:00
Milen Karaganski
93a53c4aea Fix issue #21063 2022-05-31 12:20:41 +03: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
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
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Maxime Kohlhaas
6131d5a2b4 Fix scrutinizer 2022-05-22 01:19:00 +02:00
Philippe GRAND
dcb61e05f4 fix : The property num_prelevement does not seem to exist on PaiementFourn 2022-05-21 23:25:59 +02:00
Philippe GRAND
10c5ccb5bf fix : The property id_prelevement does not seem to exist on PaiementFourn 2022-05-21 23:19:52 +02:00
Laurent Destailleur
3205d88cad
Merge pull request #20962 from Hystepik/develop#7 
Fix : facture fourn type not init in radio
 2022-05-21 20:07:42 +02:00
Lucas Marcouiller
9c9acf1538 Fix : facture fourn type not init in radio 2022-05-21 19:15:15 +02:00
Lucas Marcouiller
b4a7657fbe fix style 2022-05-21 18:47:01 +02:00
Lucas Marcouiller
51041bbea1 Fix : php 8.0 warnings 2022-05-21 18:46:41 +02:00
Maxime Kohlhaas
755bce9fe1 Fix : date_creation must have visible=-2 2022-05-21 00:22:47 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Laurent Destailleur
7fd3bb0aae Remove deprecated code 2022-05-19 12:08:03 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +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
2a34d6354f Fix scrutinizer 2022-05-17 20:08:59 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +02:00
stickler-ci
f70a9ad04c Fixing style errors. 2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
da2a8a59f3 Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function 2022-05-11 14:38:16 +02:00
Gauthier PC portable 024
b053dee279 NEW : update rank line is possible on API for orders propal and supplier invoice 2022-05-11 14:26:21 +02:00
amarchal
d21f5eca83 add hidden option SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN 2022-05-09 20:13:06 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills 
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
 2022-04-29 17:19:18 +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
stickler-ci
7f1d5fa867 Fixing style errors. 2022-04-25 12:43:58 +00:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +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
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
da0fcb556f Fix css 2022-04-09 15:28:01 +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
eecbc05bc3 Show amount into popup of payment 2022-04-09 00:06:02 +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
Laurent Destailleur
994b500a68 PHP 8.0 compatibility 2022-04-08 00:14:29 +02:00
Laurent Destailleur
623f15711d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-07 19:26:07 +02:00
Laurent Destailleur
6ea8bd23ad
Merge pull request #20542 from ATM-Consulting/FIX_16.0_template_supplier_invoices_overlapping_conditions 
FIX 16.0 - supplier invoice card creates two invoices instead of one
 2022-04-07 18:26:40 +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
27acaa45f5 Clean deprecated field 2022-04-07 14:18:24 +02:00
Laurent Destailleur
01f11ff5f4
Merge pull request #20550 from ATM-Consulting/FIX_16.0_deprecate_amount_field_on_facture_fourn 
Fix 16.0 deprecate amount field on facture fourn?
 2022-04-07 14:06:38 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
atm-florian
d213be235e Cleaner way of fixing the SQL error on update 2022-04-05 18:32:29 +02:00
atm-florian
bb30a1c8c6 FIX 16.0 SQL error on update 2022-04-05 17:31:04 +02:00
atm-florian
216b4b7309 16.0 - deprecate amount field of FactureFournisseur and FactureFournisseurRec 2022-04-05 17:30:36 +02:00
atm-florian
046089f371 FIX 16.0 - ref_client set instead of ref_supplier (maybe copy-paste error) 2022-04-05 15:38:54 +02:00
Laurent Destailleur
f17db2a919 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-05 15:33:29 +02:00
Laurent Destailleur
40ad12c3c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-05 15:29:54 +02:00
Laurent Destailleur
efa302f865 Fix phpunit 2022-04-05 15:23:17 +02:00
Laurent Destailleur
7c591d95d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-05 13:48:39 +02:00
Laurent Destailleur
d270a1a64b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-05 13:37:13 +02:00
Laurent Destailleur
f0433244aa Fix sql 2022-04-05 13:36:25 +02:00
atm-florian
b872fb2eac FIX 16.0 - missing quotes in SQL for frequency unit update for template supplier invoices 2022-04-05 12:28:40 +02:00
atm-florian
392ba6deed FIX 16.0 - my previous fix was incomplete (missing parentheses around OR-separated conditions) 
+ replace GETPOST('fac_rec', 'int') with variable
+ make sure it works even if, one day, the "nothing selected" value for the template supplier invoice selector changes to -1 instead of ''
 2022-04-05 12:16:06 +02:00
Gauthier PC portable 024
b199234afe FIX : each time we create a supplier order, we need to give it a ref_supplier 2022-04-05 12:01:09 +02:00
atm-florian
b929c2f671 FIX 16.0 - supplier invoice card creates two invoices instead of one when creating from a template 2022-04-05 11:46:06 +02:00
Laurent Destailleur
d514d72ac5 Doxygen 2022-04-03 12:35:30 +02:00
Laurent Destailleur
d3161f2c4e Clean code 2022-04-02 16:19:34 +02:00
Laurent Destailleur
7745203c16 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-02 16:17:04 +02:00
Laurent Destailleur
bb5cf1ed2e
Merge pull request #20517 from ATM-Consulting/FIX_16.0_getNomUrl_for_supplier_invoice_templates 
FIX 16.0 - copy `title` over `ref` on FactureFournisseurRec object
 2022-04-02 16:16:55 +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
atm-florian
d84af9fdcd FIX space-based indent (misconfigured IDE didn't take editorconfig into account) 
+ fix tab-based code alignment whitespace (≠indentation)
 2022-04-01 15:40:03 +02:00
atm-florian
560b8dc04c FIX 16.0 - copy title over ref on FactureFournisseurRec object 2022-04-01 15:26:06 +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
7b84b3e92d css 2022-03-31 13:27:14 +02:00
Laurent Destailleur
af4c0dcf6a Fix missing status on tooltip 2022-03-31 11:29:56 +02:00
Gauthier PC portable 024
684e816ac3 FIX : incrementation 2022-03-30 14:12:16 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Gauthier PC portable 024
6480877b99 FIX : We need to have a different default_ref_supplier for each new fourn invoice 2022-03-30 10:01:17 +02:00
Gauthier PC portable 024
b7e7c95d2a FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders 2022-03-29 16:02:39 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
78ee498151 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-26 16:13:54 +01:00
Laurent Destailleur
d75483552d Responsive 2022-03-26 15:48:36 +01:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
e8a9a7b732 Responsive 2022-03-26 10:02:20 +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
b9095fb10c
Merge pull request #20425 from atm-GregM/DolGetButtonAction_Fourn 
FIX: replacing to dolGetButtonAction on Fourn card
 2022-03-25 15:08:42 +01:00
Laurent Destailleur
488b35d096
Merge pull request #20232 from hregis/fix_missing_advanced_perms 
FIX missing advanced perms
 2022-03-24 20:32:58 +01:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +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
Regis Houssin
4ca3d45eca NEW add hook printFieldWhere in load_state_board function 2022-03-22 15:51:30 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
GregM
f24e1862ee replacing to dolGetButtonAction on Fourn card 2022-03-22 10:29:34 +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
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Laurent Destailleur
98cc40ac8d Fix a useless group by 2022-03-17 13:57:50 +01:00
Laurent Destailleur
7aeaaab7f0
Merge pull request #20365 from gdsoftdev/fix_invoicelineorders 
Fix : keep row order into invoices created from massactions
 2022-03-17 13:37:17 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Sylvain Legrand
e97932301b DLC and DLUO are reversed in the called function 2022-03-16 22:15:49 +01:00
Jé GDSOFT
6080e1f988 fix : keep lines order when creating invoices from receptions 2022-03-15 14:59:26 +01:00
Regis Houssin
e59befa76b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms 2022-03-11 10:46:14 +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
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
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
Frédéric FRANCE
543c475a71
clean comment 2022-03-06 10:56:17 +01:00
Laurent Destailleur
893e1571b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-04 22:43:35 +01:00
Laurent Destailleur
c45d6a3bc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-04 19:45:02 +01:00
Laurent Destailleur
444abbbc0e Fix regression 2022-03-04 16:44:33 +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
Regis Houssin
e5fd11c8e0 FIX missing advanced perms 2022-03-01 09:28:38 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
kevin
22fc4317be Add init hooks on several supplier tabs 2022-02-25 09:37:36 +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
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
Henry
c32cc660a3
Update list.php 2022-02-18 08:16:56 +08:00
Henry
bb08341dc3
to disable the default pdf generation 2022-02-17 18:34:23 +08: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
0feb6e8275
Update fournisseur.facture.class.php 2022-02-15 11:18:14 +01:00
Frédéric FRANCE
11fc0da398
Update fournisseur.commande.class.php 2022-02-15 11:00:05 +01:00
Laurent Destailleur
9ba998e3ba Fix some regressions 2022-02-10 19:36:33 +01:00
Laurent Destailleur
2c6b6ce4d1 Fix sql syntax error 2022-02-10 16:35:50 +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
9e17fe8f4e Fix bad cancelation 2022-02-10 15:16:59 +01:00
Laurent Destailleur
2b65ba4a45 FIX insert free price using price without tax on order 2022-02-10 15:03:41 +01:00
Laurent Destailleur
024f12aa9b Fix php5.6 2022-02-10 13:18:21 +01:00
Laurent Destailleur
954938cd75 Fix buttons 2022-02-10 12:33:28 +01:00
Laurent Destailleur
f787512592 Fix buttons 2022-02-10 12:30:29 +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
8db6152a4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-10 11:23:00 +01:00
Laurent Destailleur
6c8fafddf6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:22:31 +01:00
Laurent Destailleur
7a1c4172a6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:20:09 +01:00
Laurent Destailleur
a40f76c1d8 Merge 2022-02-10 11:15:59 +01:00
Laurent Destailleur
40f0aa45c8 Merge 2022-02-10 11:15:45 +01:00
Laurent Destailleur
793e43c7c6
Update fournisseur.commande.class.php 2022-02-10 09:29:11 +01:00
noec764
d9bac75a63
Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet 2022-02-09 15:33:45 +01:00
Noé Courtier
e4c1978e12 Change of SQL request when fetching CommandeFournisseurLigne 2022-02-09 12:24:33 +01:00
atm-greg
4c6fd42e3a fix with eldy recommendations 2022-02-09 09:47:48 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
atm-greg
6035a374b7 fix bad array index 2022-02-02 14:44:38 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
f9cb209262 Fix max nb of lines in supplier index page 2022-01-31 12:18:04 +01:00
Laurent Destailleur
a631c94193 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-28 15:58:15 +01:00
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/reception/card.php
 2022-01-28 15:57:09 +01:00
Laurent Destailleur
4b5792899e FIX Presentation of qty already order duplicated on reception card 2022-01-28 15:51:18 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
Laurent Destailleur
0e5907e220 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:35 +01:00
stickler-ci
bc37e75e7f Fixing style errors. 2022-01-23 18:49:28 +00:00
Laurent Destailleur
7a8d0b698a
Merge branch 'develop' into packbuyprice 2022-01-23 19:46:26 +01:00
Laurent Destailleur
dee020f286
Update getSupplierPrices.php 2022-01-23 19:40:23 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	build/docker/docker-compose.yml
 2022-01-23 18:52:47 +01:00
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Laurent Destailleur
3f33f20fb1
Merge pull request #19840 from dolibit-ut/patch-369 
add CANCEL Button
 2022-01-23 13:06:23 +01:00