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

709 Commits

Author SHA1 Message Date
VESSILLER
144a7e01b4 NEW remove default percentage for event creation url 2022-12-26 14:33:30 +01:00
Laurent Destailleur
1368128743 Debug v17 2022-12-26 13:00:22 +01:00
Laurent Destailleur
f0a862712f Debug v17 2022-12-26 12:44:16 +01:00
Laurent Destailleur
8c237c8f38 Debug v17 2022-12-24 15:32:20 +01:00
Frédéric FRANCE
a08d84b995 fix code 2022-12-23 14:11:13 +01:00
Frédéric France
637fc95265 clean code 2022-12-22 22:29:24 +01:00
Laurent Destailleur
3b87aadc48 Debug v17 2022-12-16 12:59:47 +01:00
Laurent Destailleur
496f9f5466
Merge pull request #23007 from fappels/17_fix_negative_consume 
FIX Negative consumption in MO creates additional goods issue #21343
 2022-11-26 16:12:37 +01:00
Maxime Kohlhaas
eb7222227d Fix : use count() in lists - part 3 2022-11-26 01:53:18 +01:00
Francis Appels
7a8c35baa7 FIX Negative consumption in MO creates additional goods issue #21343 2022-11-26 01:33:11 +01:00
Laurent Destailleur
ba1f82b354 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:32 +01:00
Laurent Destailleur
f79e52bc85 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:17 +01:00
stickler-ci
b5cafeefcf Fixing style errors. 2022-11-20 23:16:19 +00:00
Christian Humpel
92647d30e7 Fix #22768 remove "natural_search" on status and fk_parent_line. 2022-11-21 00:07:50 +01:00
Faustin
c75183209a checkbox colum on left for mrp list 2022-11-19 16:54:55 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-16 20:35:29 +01:00
atm-lena
81367e353b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_of_consumption_selectbatch 2022-11-09 08:58:57 +01:00
stickler-ci
15a2f71534 Fixing style errors. 2022-11-08 08:55:25 +00:00
atm-lena
d166ae9167 MOChild => Linked Object 2022-11-08 09:46:55 +01:00
atm-lena
6dbc57998a Fix Object Linked MO Line 2022-11-04 11:51:47 +01:00
lmarcouiller
bbebdbb840 Fix php 8.1 warnings 2022-10-28 15:48:46 +02:00
Laurent Destailleur
06d94c9a97 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-19 17:11:32 +02:00
Laurent Destailleur
36777ee8c7 Fix phpunit 2022-10-18 00:48:05 +02:00
Laurent Destailleur
ebd7605545 Fix bad recalculation of cost price of production of a product 2022-10-17 17:45:57 +02:00
Laurent Destailleur
159628be56 Fix the quick filter on MO 2022-10-17 15:54:48 +02:00
Laurent Destailleur
99962b9ade FIX Search ambigous field on MO list 2022-10-17 15:41:59 +02:00
Laurent Destailleur
221b2dc288 Standardize code 2022-10-10 10:46:46 +02:00
Laurent Destailleur
5e6e6e1c98 NEW #22370 Modulebuilder supports 'alwayseditable' (like extrafields) 2022-09-27 01:50:56 +02:00
Alexandre SPANGARO
6abca50afe Use isModEnabled 2022-09-25 15:31:29 +02:00
Alexandre SPANGARO
1dfcf8eceb Use isModEnabled 2022-09-25 15:31:07 +02:00
Alexandre SPANGARO
ab9dda0f93 Use isModEnabled 2022-09-25 06:31:42 +02:00
Philippe GRAND
66360758aa update code toward php8 compliance 2022-09-24 14:51:39 +02:00
Philippe GRAND
6d7a1c4f30 update code toward php8 compliance 2022-09-24 14:50:47 +02:00
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Laurent Destailleur
388dd6395b Clean code 2022-09-22 14:06:50 +02:00
jpb
4900ceec78 fix issue #22356 2022-09-22 08:38:28 +02:00
jpb
64c92cc66d add escape 2022-09-21 16:11:18 +02:00
jpb
8f29d5c0eb add cast and quoted 2022-09-21 15:58:41 +02:00
jpb
70a1815b9c remove code 2022-09-21 14:12:55 +02:00
jpb
78adf501b3 stickler 2022-09-21 11:08:46 +02:00
jpb
a0579d115d add element_element rowid 2022-09-21 11:02:00 +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
22a0f69cf6
Merge pull request #22268 from atm-gauthier/FIX/input_hidden_with_fk_product_of_line_on_mo_production 
FIX : input hidden with fk_product of line on mo production can be usefull
 2022-09-20 00:58:54 +02:00
Laurent Destailleur
33f94fd679
Merge pull request #22302 from atm-adrien/FIX_no_splitAll_for_multiple_batch 
FIX : No splitAll for multiple batch
 2022-09-20 00:10:02 +02:00
Laurent Destailleur
daeb1eed03
Merge pull request #22313 from atm-jpb/FIX_hook_mrp_tpl 
FIX : add hook in tpl file
 2022-09-19 17:49:59 +02:00
jpb
cde977c64f add hook in tpl file 2022-09-16 18:28:16 +02:00
Adrien Raze
674d85df4f FIX : No splitAll for multiple batch 2022-09-16 10:14:39 +02:00
Laurent Destailleur
08aa34b8db Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-15 18:31:45 +02:00
Laurent Destailleur
e0e9701830 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-15 18:30:42 +02:00
Gauthier PC portable 024
e403a3a896 FIX : input hidden with fk_product of line on mo production can be usefull 2022-09-14 09:40:46 +02:00
atm-lena
7b7e0437a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_of_consumption_selectbatch 2022-09-12 13:42:21 +02:00
Laurent Destailleur
f48752fc16 FIX inventory code must be different at each transation 2022-09-12 13:25:07 +02:00
Laurent Destailleur
4566342d59 FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 11:47:06 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
UT from dolibit
b1ff726e9c
Update mo_card.php 2022-09-08 19:55:11 +02:00
Frédéric France
63195e0ca3 fix license 2022-09-07 20:21:01 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
cfd3eeb245 NEW All ajax pages have now a top_httphead() 2022-09-03 20:08:13 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Philippe GRAND
4250625e38 FIX php8 compatibility 2022-08-28 14:20:24 +02:00
stickler-ci
797f30a2db Fixing style errors. 2022-08-24 07:17:51 +00:00
atm-lena
9537fb3808 FIX php 8 error 2022-08-24 09:12:39 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Laurent Destailleur
c13620b218
Merge pull request #21800 from atm-lena/develop_NEW_SplitAll_OF_V2 
MO : Split All of v2
 2022-08-22 13:26:09 +02:00
Christian Humpel
e5db83d19f Fix: add urlencode to backtopage. 2022-08-22 11:26:48 +02:00
Christian Humpel
75be74b450 Fix: correct parameter "backtopage". 2022-08-19 20:23:53 +02:00
atm-lena
0e09e43714 Clean 2022-08-19 14:44:25 +02:00
atm-lena
4a6b854963 FIX mode de calcul splitall 2022-08-19 11:29:56 +02:00
atm-lena
17af973da3 FIX erreur 2022-08-18 18:50:05 +02:00
atm-lena
c0c540f4cb Traitement du splitall 2022-08-18 17:39:52 +02:00
atm-lena
3e9a053b60 FIX data quantités sur tr 2022-08-18 13:31:51 +02:00
atm-lena
7bd6f0338e Ajout de la quantité maximum par produit 2022-08-18 12:17:16 +02:00
atm-lena
69fcb0939f Affichage du split all (numéros de série uniques) 2022-08-18 12:12:58 +02:00
jpb
a03ef11e05 add redirect on action confirm addconsumedline and addproduceline 2022-08-13 14:02:10 +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
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
Laurent Destailleur
6301139027
Update mo_production.php 2022-08-10 04:42:08 +02:00
Laurent Destailleur
427541beaa FIX #21668 2022-08-10 04:07:18 +02:00
jpb
a3cf76cfd7 add token to link 2022-08-04 15:43:14 +02:00
Francis Appels
43ea5f73e3 Add missing require for MoLine 2022-07-22 13:41:24 +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
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Laurent Destailleur
6bd89922b9
Merge pull request #21257 from atm-lena/develop_FIX_nobackoption_actionaddupdatedelete 
FIX : $noback option
 2022-06-14 19:57:03 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
atm-lena
82ddaeda74 FIX : $noback option 2022-06-14 10:41:32 +02:00
Laurent Destailleur
c2fe5de852
Merge pull request #21195 from frederic34/useismodenabled 
use isModEnabled function
 2022-06-12 11:56:31 +02:00
Laurent Destailleur
2387e2f990 Fix token 2022-06-11 21:50:30 +02:00
Laurent Destailleur
aba122a52b Debug v16 2022-06-11 21:47:00 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
lmarcouiller
2d13b47441 fix php8.0 warnings 2022-05-31 11:36:54 +02:00
Laurent Destailleur
639b6de8d4
Merge pull request #21023 from atm-orian/NEW_OF_Child_Orian 
OF child Creation : redirection
 2022-05-25 19:16:30 +02:00
Laurent Destailleur
9a7c28d61d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-25 09:12:59 +02:00
Laurent Destailleur
8385ca604f
Merge pull request #20098 from atm-lena/NEW_OF_Child 
Create MO Child
 2022-05-24 22:00:19 +02:00
Laurent Destailleur
1d249a5be0
Merge pull request #20996 from atm-quentin/FIX_origin_mo_mvt_origin 
FIX  link not interpreted by browser
 2022-05-24 21:35:13 +02:00
atm-orian
e8ed75cac3 redirection OF avec des enfants par Orian 2022-05-24 11:34:39 +02:00
atm-lena
eba84382dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-05-24 09:37:39 +02:00
Quentin VIAL-GOUTEYRON
9ed75d01bd fix missing token on mo card 2022-05-23 12:43:30 +02:00
Quentin VIAL-GOUTEYRON
48151b47a6 FIX mvt origin 2022-05-23 12:31:37 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
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
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
stickler-ci
2d1615de27 Fixing style errors. 2022-05-11 15:22:16 +00:00
atm-lena
1555a6540b Translation 2022-05-11 12:40:51 +02:00
atm-lena
e716c9abd6 Force to warehouse for consume produt in mo 2022-05-11 12:38:24 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
atm-lena
2f03a15956 FIX missing escape() 2022-04-22 08:47:57 +02:00
atm-lena
b58c1c37db Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch 2022-04-11 08:55:41 +02:00
kevin
6a8e3761c3 Resolve merge conflicts 2022-04-08 09:54:17 +02:00
kevin
135e4f1768 Add tooltip to explain the trash action 2022-04-08 09:50:40 +02:00
stickler-ci
de6e3c6d55 Fixing style errors. 2022-04-06 13:19:34 +00:00
kevin
69eaf1e708 Rework some code 2022-04-06 14:59:18 +02:00
kevin
8be5cccb4e Reverse stock movements on mo consumed product 2022-04-06 12:32:10 +02:00
Laurent Destailleur
0fde73b4bc
Merge pull request #20405 from elsp1991/fix/pmp_price_of_produced_prod_mrp 
FIX MO produced product WAP calculation when MO is based on BOM (not free lines)
 2022-03-24 14:29:33 +01:00
Laurent Destailleur
38439603be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 13:23:04 +01:00
Laurent Destailleur
ef204b2620 Fix column conditions 2022-03-24 12:52:04 +01:00
Ilias Patsiaouras
b666ec2142 removing dead code free and bom lines are MO lines 2022-03-18 13:46:40 +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
Regis Houssin
193a073b16 FIX missing multientity managed 2022-03-11 11:18:09 +01:00
atm-lena
5c576d0ae5 FIX updateselectwarehousebybatch : request sql must take batch, no id + fix delete condition 2022-03-08 11:21:04 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Florian HENRY
3b06a08aa0 FIX: User name in ManufacturingOrder 2022-03-03 13:56:10 +01:00
John Livingston
1ece554c92
Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
atm-lena
5072f69ee9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch 2022-02-25 13:45:13 +01:00
atm-lena
49545228c8 Travis 2022-02-22 11:59:00 +01:00
atm-lena
5cf723e7a5 Ret Travis 2022-02-22 11:50:47 +01:00
atm-lena
45fe83289f MoChild category 2022-02-22 11:32:33 +01:00
atm-lena
ce12442c36 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:22:41 +01:00
atm-lena
e5039a67b0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-02-21 10:22:22 +01:00
stickler-ci
cf2f2c283b Fixing style errors. 2022-02-21 09:17:20 +00:00
atm-lena
27c70466c2 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:14:19 +01:00
atm-lena
f177973efe Don't create Mo Child if it's only a product line on BOM 2022-02-21 10:13:25 +01:00
stickler-ci
e02b82e346 Fixing style errors. 2022-02-21 09:09:39 +00:00
atm-lena
0cbf374fa5 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:06:30 +01:00
atm-lena
c4a8bffa48 FIX Travis : global $db 2022-02-21 10:05:18 +01:00
stickler-ci
7e6a5d5792 Fixing style errors. 2022-02-17 10:13:30 +00:00
atm-lena
c2bc3b20bb Don't display collapse if no bom on bomline 2022-02-17 11:05:03 +01:00
Frédéric FRANCE
c8640f329e
add missing global 2022-02-15 18:31:05 +01:00
atm-lena
398927f2c8 Clean Code 2022-02-15 16:24:39 +01:00
atm-lena
382aaf8538 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 16:08:32 +01:00
atm-lena
498d56319d Clean Code 2022-02-15 16:08:18 +01:00