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

207 Commits

Author SHA1 Message Date
atm-lena
d42d910c08 FIX Retours 2022-07-08 16:02:31 +02:00
atm-lena
7c82fc5da6 WIP 2022-07-08 10:04:16 +02:00
atm-lena
16415a1c92 Clean Code 2022-07-06 17:28:29 +02:00
atm-lena
6925dc2ae1 Edit unit bom line service 2022-07-06 15:00:07 +02:00
atm-lena
55f0dada34 WIP 2022-07-06 13:55:43 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +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
aba122a52b Debug v16 2022-06-11 21:47:00 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +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
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
3056635aaf css 2022-03-24 14:04:03 +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
13cfe858f2 Fixing style errors. 2022-02-17 09:53:02 +00:00
atm-lena
498d56319d Clean Code 2022-02-15 16:08:18 +01:00
Adrien Raze
34d2e0b8b4 FIX : Fixed sub bom costs problems 2022-02-15 10:29:42 +01:00
atm-lena
8db75f0d04 WIP 2022-02-08 15:54:31 +01:00
Laurent Destailleur
ffbeda50bd Better picto for collpase of sub-bom 2022-01-29 00:07:04 +01:00
Laurent Destailleur
d72538506f
Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop 
NEW : Sub-bom
 2022-01-28 19:01:30 +01:00
stickler-ci
9342fa8781 Fixing style errors. 2022-01-26 14:15:53 +00:00
Laurent Destailleur
3e1cfc2997 NEW Add status "Obsolete" to KM articles 2022-01-26 11:29:27 +01:00
Adrien Raze
f37c04bc2f NEW : Add the possibility to add sub-BOMs to BOM 2022-01-25 12:06:40 +01:00
Laurent Destailleur
e113fe468f Clean code 2021-11-12 14:57:36 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Laurent Destailleur
5baba69970 Fix regressions 2021-10-28 15:05:50 +02:00
Laurent Destailleur
ce4fe3f400 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 18:33:47 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Adrien Raze
b5b7281094 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_sub_BOM 2021-10-19 16:40:02 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
0e1cc2b096 Fix cost price is 0. 2021-09-27 18:46:27 +02:00
Laurent Destailleur
c90af50585
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-24 13:39:20 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
45c5abea69 FIX calculateCosts of BOM must not be included into fetch 2021-09-20 15:29:55 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
97bb04c5b0
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-18 16:31:51 +02:00
Adrien Raze
6cd92ca829 NEW : Trad + Comments + Adding tooltips for conf 2021-08-23 12:15:09 +02:00
Adrien Raze
2343ff2ed4 NEW : ShowAll/HideAll Options 2021-08-23 11:58:15 +02:00
Adrien Raze
093cec316d NEW : Hide/Show sub-BOM on clisk on the +/- + Multiply qty & total price of sub-BOM by qty of parent_line 2021-08-23 11:43:42 +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
Adrien Raze
6de7d9b0af NEW : Add sub-BOM lines on BOM card 2021-08-20 13:37:28 +02:00
Adrien Raze
f4d4733b15 NEW : Select for BOM workable + JS to fill it according to the product selected 2021-08-19 15:37:32 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
36d50c940a Clean code 2021-05-06 21:21:11 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
stickler-ci
8fda2ba2b4 Fixing style errors. 2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
UT from dolibit
cce6224c91
Update bom_card.php 
$help_url ='EN:Module_BOM';
llxHeader('', $title, $help_url);
 2021-04-20 11:33:47 +02:00
UT from dolibit
3d18b0fbf7
Update bom_card.php 
$title = $langs->trans('BOM');
 2021-04-12 18:51:44 +02:00
Laurent Destailleur
5ff9038e4e Fix permissions on BOMs 2021-03-23 18:02:52 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Laurent Destailleur
e318a84940 Fix #yogosha5664 2021-03-18 20:38:19 +01:00
Frédéric FRANCE
3c8089af0d
code syntax bom directory 2021-02-23 17:51:46 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
788ef257a9 Fix GETPOST for qty 2021-01-11 13:02:05 +01:00
Laurent Destailleur
ce035eb4ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-06 21:33:59 +01:00
Laurent Destailleur
2a31ca969f FIX #15388 #15891 2021-01-06 21:29:58 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
Frédéric FRANCE
7ca1df6d46
remove warning 2020-11-25 17:12:56 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
57b7666bf1 FIX #14326 2020-09-27 22:20:24 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
355d62e7db FIX Update line of BOM 2020-08-12 20:24:44 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
c460cff01c Fix calculation and add tooltip to understand it. 2020-05-23 01:17:01 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
ed51ce8734 Look and feel v12 2020-04-12 19:56:50 +02:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Maxime Kohlhaas
b0e7bd8a30 Finish BOM cost calculation 2020-03-30 10:20:56 +02:00
Maxime Kohlhaas
0512b3a7a7 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_bom_cost 2020-03-28 16:37:39 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Maxime Kohlhaas
bcbccf0c83 Start working on bom cost 2020-03-24 10:32:31 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
Laurent Destailleur
e5808e3335 FIX #12995 2020-02-03 04:48:17 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
115b7f2c6b Fix break on second column 2020-01-09 11:05:23 +01:00
Laurent Destailleur
0802df78b5 Debug MRP 2020-01-08 17:56:02 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
eb69538d17 Fix if we insert a product already the product to produce 2019-11-29 23:51:46 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM 
Enhance demo data for TakePOS
 2019-11-28 15:18:14 +01:00