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

2144 Commits

Author SHA1 Message Date
Laurent Destailleur
b051da4b04 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-07 22:50:58 +02:00
Laurent Destailleur
73c1efecaf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-07 22:47:36 +02:00
Laurent Destailleur
4e4b0e0039 FIX Duplicate creation of invoice when closing shipment linked to order 2022-10-07 22:44:20 +02:00
Alexandre SPANGARO
fee02fa632 Use isModEnabled 2022-09-25 22:53:07 +02:00
Laurent Destailleur
acaf066d1d
Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references 
Add an option to manage input size for customer / supplier references
 2022-09-25 18:48:55 +02:00
Alexandre SPANGARO
e6e058a713 Use isModEnabled 2022-09-25 15:30:16 +02:00
Alexandre SPANGARO
9e957edc3b Use isModEnabled 2022-09-25 06:30:51 +02:00
Alexandre SPANGARO
eb55b307c0 Use isModEnabled 2022-09-25 06:04:27 +02:00
Philippe GRAND
ed8962c091 update code toward php8 compliance 2022-09-24 14:48:43 +02:00
Laurent Destailleur
e1b5e5033f Clean code of deprecated field 2022-09-23 09:35:17 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
36e1bfb297 NEW Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF 2022-09-21 00:50:04 +02:00
Laurent Destailleur
79ac1a2e8d
Merge pull request #22308 from frederic34/patch-10 
FIX cannot enter a quantity with a comma
 2022-09-20 00:06:35 +02:00
Noé Cendrier
8908011252 this should be cleaned when we click on the eraser 2022-09-19 16:54:12 +02:00
Frédéric FRANCE
3d1595e21b
cannot enter a quantity with a comma 2022-09-16 16:07:07 +02:00
Laurent Destailleur
38676b6c04 Fix phpunit 2022-09-10 00:54: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
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
Laurent Destailleur
da0cf1cbf2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 23:00:10 +02:00
Laurent Destailleur
764e6158eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-08 22:57:50 +02:00
Laurent Destailleur
36b798e9a8 Fix responsive 2022-09-08 22:16:31 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Gauthier PC portable 024
4d396bbf50 FIX : same thing in deleteline 2022-09-06 09:48:10 +02:00
Laurent Destailleur
c28966864b FIX data integrity for llx_delivery table 2022-09-06 01:42:48 +02:00
Gauthier PC portable 024
aff9a423ab FIX : fk_expedition in $line can be usefull for triggers 2022-09-05 12:28:59 +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
79fc182201 Update code 2022-09-03 11:24:17 +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
Sylvain Legrand
a1bae3453a Add an option to manage input size for customer / supplier references 2022-09-01 08:34:22 +02:00
Philippe GRAND
162cdcc676 update code 2022-08-31 22:24:43 +02:00
Philippe GRAND
d779a42b22 update code 2022-08-31 22:24:03 +02:00
Philippe GRAND
94f4d50035 update code 2022-08-31 22:23:39 +02:00
Philippe GRAND
721b5726f1 update code 2022-08-31 22:23:14 +02:00
Philippe GRAND
7093da9051 update code 2022-08-31 22:22:49 +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
194c76727e fix php8 warnings 2022-08-31 21:37:10 +02:00
Laurent Destailleur
5d8c7d2f0b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-31 15:53:19 +02:00
Laurent Destailleur
215f89d545 Fix phpcs 2022-08-25 23:44:57 +02:00
JC Prieto
804480ca2d
Update card.php 
Same behavior as  products with not lot. (See line 1338).
 2022-08-25 12:51:18 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +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
Laurent Destailleur
06b9b684af
Merge pull request #21722 from Easya-Solutions/new-expedition-card-eat-sell-by-show 
NEW show SellBy/EatBy dates for each batch product in shipment card
 2022-08-22 15:14:48 +02:00
Laurent Destailleur
75abbc819b Clean code 2022-08-14 16:46:22 +02:00
lvessiller
8ac5bd4228 NEW show sell-by and eat-by dates only if not empty 2022-08-12 15:20:25 +02:00
lvessiller
9a780a25d8 NEW show SellBy/EatBy dates for each batch product in shipment card 2022-08-11 17:33:28 +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
bd3af19978
Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink 
NEW add objectLink on expedition
 2022-07-10 19:33:49 +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
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +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
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
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
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
Quentin VIAL-GOUTEYRON
2e065e1702 FIW : add missing thead on table 2022-07-05 13:11:36 +02:00
Laurent Destailleur
3f354be119
Update shipment.php 2022-07-04 01:21:41 +02:00
Laurent Destailleur
18a6f52abb
Update shipment.php 2022-07-04 01:20:50 +02:00
stickler-ci
7d9ab1b717 Fixing style errors. 2022-07-02 17:28:16 +00:00
Lenin Rivas
3aa41a25b9
Correct Stock in Shipment 2022-07-02 12:23:46 -05:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
cf34d07d5d
Update card.php 2022-06-27 12:22:46 +02:00
Laurent Destailleur
69cbe48a75 doc 2022-06-27 12:07:34 +02:00
Anthony Berton
bcdbcf5070
Update card.php 2022-06-27 11:18:38 +02:00
Anthony Berton
3a8f479db7
Update card.php 2022-06-27 11:16:50 +02:00
BB2A Anthony Berton
6a80d81d4a FIX 2022-06-27 09:11:33 +02:00
BB2A Anthony Berton
b046d92efb STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT 2022-06-27 09:00:57 +02:00
BB2A Anthony Berton
324b145833 FIX - php V8 expedition card 2022-06-27 08:42:33 +02:00
Laurent Destailleur
14832bb543 FIX timeout due to too many the same request 2022-06-25 04:15:04 +02:00
Faustin
9ede77c0e7 NEW #20650 completing checkcolumn on left for expedition list 2022-06-24 17:32:28 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
atm-GregM
e8a5d4f008
Merge branch 'develop' into NEW_exped_ObjectLink 2022-06-21 15:31:45 +02:00
GregM
8c0b1efce4 NEW add objectLink expedition 2022-06-21 15:21:45 +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
Laurent Destailleur
6c1c8058c1 Doc 2022-06-14 16:56:03 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
stickler-ci
858926d95e Fixing style errors. 2022-06-02 08:15:04 +00:00
jyhere
bd1d6de326
FIX : array merges in expedition class 2022-06-02 10:11:53 +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
Maxime Kohlhaas
6131d5a2b4 Fix scrutinizer 2022-05-22 01:19:00 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +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
770a0fbe8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-11 17:34:40 +02:00
Laurent Destailleur
480fda43c5 Clean code 2022-04-11 17:34:19 +02:00
Laurent Destailleur
139c5a4327
Merge pull request #19518 from 1ocate/1ocateAddShipmentclose 
NEW Mass action close shipment
 2022-04-11 16:49:34 +02:00
Laurent Destailleur
af5444dc91 FIX ref not set in message of closing shipment 2022-04-11 16:48:56 +02:00
Laurent Destailleur
4fc07d96d8
Merge pull request #20519 from joseplluis/patch-11 
BUG expedition and warehouse with children
 2022-04-02 16:22:23 +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
Josep Lluís
eb14d1d31f
BUG expedition and warehouse with childen 
if a warehouse was selected by user, picking is limited to this warehouse and his children (same check is done in products without batch)
 2022-04-01 16:37:32 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02: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
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
stickler-ci
aec5f4da13 Fixing style errors. 2022-03-21 11:25:46 +00:00
GregM
362352b198 replacing to dolGetButtonAction on Expedition card 2022-03-21 12:18:36 +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
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
792dcc6334 FIX creation of the shipment if order contains services - 2/2 2022-03-04 19:14:57 +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
70a18bc15a FIX creation of the shipment if order contains services 2022-03-01 01:28:47 +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
Francis Appels
c242a0561b Fix shipping list, e.shipping_method_id should be e.fk_shipping_method. 
Disabled searchall for shipping method, does not work.
 2022-02-25 16:11:16 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
c8640f329e
add missing global 2022-02-15 18:31:05 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
c474ee216f
Update expedition.class.php 2022-02-15 11:15:34 +01:00
Laurent Destailleur
6b5c0769b8 FIX #19786 2022-01-24 14:09:53 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
 2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
 2022-01-14 10:30:39 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 11:05:57 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Marc de Lima Lucio
b110ca6ead FIX: order to shipment: FIX hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a warehouse) 2022-01-12 16:40:43 +01:00
Laurent Destailleur
79fbe7488e
Merge pull request #19721 from grandoc/new_branch_01_01_2022 
Fix : Fatal error: Uncaught Error: Call to a member function deleteFr…
 2022-01-06 16:04:18 +01:00
iouston
f91c376a7c
minor change on getNextNumRef doc block 2022-01-04 16:44:13 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Philippe GRAND
17d1fa190f Fix : Fatal error: Uncaught Error: Call to a member function deleteFromShipment() on null in /home/httpd/vhosts/doliweb.com/httpdocs/expedition/class/expedition.class.php on line 1463 2022-01-01 15:27:20 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
e983ba58f9
Merge pull request #19534 from Hystepik/develop#3 
Fix : php8.0  warning
 2021-12-08 18:51:51 +01:00
Laurent Destailleur
90cff6aed9
Update list.php 2021-12-08 18:50:42 +01:00
Laurent Destailleur
51e7484d55 Fix var not defined 2021-12-08 18:49:57 +01:00
Laurent Destailleur
ea45fdce5c
Merge pull request #19535 from Hystepik/develop#4 
Fix : php 8.0 warnings
 2021-12-08 18:44:16 +01:00
Laurent Destailleur
72dc560ce8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:27:28 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
990882e264
Merge branch 'develop' into Debug_15 2021-12-08 15:53:33 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Francis Appels
5803060caf Fix shipment delete 2021-12-06 14:43:11 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
lmarcouiller
4c92af9aca fix php8.0 warnings 2021-12-01 15:24:25 +01:00
Jay Yeo
f3fa611d34
Merge branch 'Dolibarr:develop' into 1ocateAddShipmentclose 2021-11-30 23:05:11 +07:00
Lucas Marcouiller
1c4a7a00cb fix php8.0 warning 2021-11-30 16:35:46 +01:00
atm-greg
db06de0ac2 add printFieldListHaving hook 2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
stickler-ci
31dd11c9c0 Fixing style errors. 2021-11-30 13:11:28 +00:00