Commit Graph

5996 Commits

Author SHA1 Message Date
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
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