Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

292 Commits

Author SHA1 Message Date
atm-lena
c068eebc43 Add function "convertDurationtoHour" 2022-07-12 10:03:31 +02:00
atm-lena
db5c5b9020 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 09:21:22 +02:00
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
503e2310ea WIP 2022-07-06 16:51:50 +02:00
atm-lena
dadff083a4 Change unit dynamic 2022-07-06 16:17:22 +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
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/productbatch.class.php
 2022-06-02 19:39:42 +02:00
jyhere
f582814c0f Update bom.class.php 2022-06-02 09:46:26 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
0b9d4de20d Fix warning 2022-05-31 14:20:59 +02:00
lmarcouiller
cf2c46b583 Fix : php 8.0 warnings 2022-05-18 12:31:09 +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
a22d66b021 css 2022-03-24 13:31:03 +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
6e5c7358de Merge branch 'develop' into NEW_Needs_net_tab_on_bom 2022-02-17 20:06:38 +01:00
Adrien Raze
f16567a44a Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_total_cost_for_sub_bom 2022-02-17 10:45:19 +01: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
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Adrien Raze
34d2e0b8b4 FIX : Fixed sub bom costs problems 2022-02-15 10:29:42 +01:00
Quentin VIAL-GOUTEYRON
dd0202de47 fix comment doc 2022-02-10 10:46:04 +01:00
stickler-ci
7cf9448609 Fixing style errors. 2022-02-10 09:22:53 +00:00
Quentin VIAL-GOUTEYRON
9e667e0155 NEW Needed nets bom 2022-02-09 15:55:21 +01:00
Laurent Destailleur
902246e50b Fix phpcs 2022-01-31 14:05:30 +01:00
stickler-ci
9342fa8781 Fixing style errors. 2022-01-26 14:15:53 +00:00
Adrien Raze
36068d4279 FIX : Fixing total errors 2022-01-26 14:41:36 +01:00
ptibogxiv
61e6e33387 FIX bom.class.php 2022-01-11 20:37:20 +01:00
Laurent Destailleur
564bae453e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-01-10 21:00:38 +01:00
Laurent Destailleur
c334c3cd58 Update bom.class.php 2022-01-10 20:58:08 +01:00
Florian HENRY
f5c04c81a9 Merge branch 'new_refproduct_bom_tooltip' of github.com:FHenry/dolibarr into new_refproduct_bom_tooltip 2022-01-07 08:28:40 +01:00
Florian HENRY
59b1feaf2e fix include 2022-01-07 08:27:49 +01:00
stickler-ci
f71092e05c Fixing style errors. 2022-01-06 20:56:51 +00:00
Florian HENRY
a0fb0b8741 NEW: add ref product into BOM tooltips 2022-01-06 21:48:12 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Frédéric FRANCE
c56f180515 can merge products but experimental 2021-11-23 21:52:40 +01:00
Frédéric FRANCE
dc3bfcfb87 can modify tooltip by reference 2021-11-22 19:57:26 +01: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
1e735c48aa Code comment 2021-09-20 15:31:57 +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
ee362a42bd css 2021-09-19 21:06:09 +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
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
a8f4eef0f6 Merge pull request #18445 from erikvanberkum/develop 
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1.
 2021-08-28 18:40:54 +02:00