Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 05:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
91,506 Commits 36 Branches 190 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

125 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
ptibogxiv
6fd996381e FIX display variant card 2020-10-27 23:07:05 +01:00
Laurent Destailleur
d2a2d74f7e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/langs/am_ET/mrp.lang
	htdocs/langs/ar_SA/mrp.lang
	htdocs/langs/az_AZ/mrp.lang
	htdocs/langs/bg_BG/mrp.lang
	htdocs/langs/bn_BD/mrp.lang
	htdocs/langs/bn_IN/mrp.lang
	htdocs/langs/bs_BA/mrp.lang
	htdocs/langs/ca_ES/mrp.lang
	htdocs/langs/cs_CZ/mrp.lang
	htdocs/langs/da_DK/mrp.lang
	htdocs/langs/de_DE/mrp.lang
	htdocs/langs/el_GR/mrp.lang
	htdocs/langs/en_US/mrp.lang
	htdocs/langs/es_ES/mrp.lang
	htdocs/langs/et_EE/mrp.lang
	htdocs/langs/eu_ES/mrp.lang
	htdocs/langs/fa_IR/mrp.lang
	htdocs/langs/fi_FI/mrp.lang
	htdocs/langs/fr_FR/mrp.lang
	htdocs/langs/gl_ES/mrp.lang
	htdocs/langs/he_IL/mrp.lang
	htdocs/langs/hi_IN/mrp.lang
	htdocs/langs/hr_HR/mrp.lang
	htdocs/langs/hu_HU/mrp.lang
	htdocs/langs/id_ID/mrp.lang
	htdocs/langs/is_IS/mrp.lang
	htdocs/langs/it_IT/mrp.lang
	htdocs/langs/ja_JP/mrp.lang
	htdocs/langs/ka_GE/mrp.lang
	htdocs/langs/km_KH/mrp.lang
	htdocs/langs/kn_IN/mrp.lang
	htdocs/langs/ko_KR/mrp.lang
	htdocs/langs/lo_LA/mrp.lang
	htdocs/langs/lt_LT/mrp.lang
	htdocs/langs/lv_LV/mrp.lang
	htdocs/langs/mk_MK/mrp.lang
	htdocs/langs/mn_MN/mrp.lang
	htdocs/langs/nb_NO/mrp.lang
	htdocs/langs/ne_NP/mrp.lang
	htdocs/langs/nl_NL/mrp.lang
	htdocs/langs/pl_PL/mrp.lang
	htdocs/langs/pt_PT/mrp.lang
	htdocs/langs/ro_RO/mrp.lang
	htdocs/langs/ru_RU/mrp.lang
	htdocs/langs/sk_SK/mrp.lang
	htdocs/langs/sl_SI/mrp.lang
	htdocs/langs/sq_AL/mrp.lang
	htdocs/langs/sr_RS/mrp.lang
	htdocs/langs/sv_SE/mrp.lang
	htdocs/langs/sw_SW/mrp.lang
	htdocs/langs/th_TH/mrp.lang
	htdocs/langs/tr_TR/mrp.lang
	htdocs/langs/uk_UA/mrp.lang
	htdocs/langs/uz_UZ/mrp.lang
	htdocs/langs/vi_VN/mrp.lang
	htdocs/langs/zh_CN/mrp.lang
	htdocs/langs/zh_HK/mrp.lang
	htdocs/langs/zh_TW/mrp.lang
	htdocs/mrp/class/mo.class.php
	htdocs/mrp/mo_agenda.php
	htdocs/mrp/mo_card.php
	htdocs/mrp/mo_document.php
	htdocs/mrp/mo_movements.php
	htdocs/mrp/mo_note.php
	htdocs/mrp/mo_production.php
 2020-10-27 02:55:22 +01:00
Alfredo Altamirano
214cd2c99b Update references of MO translation string 2020-10-26 15:44:26 -06:00
stickler-ci
8bfb04ea7f Fixing style errors. 2020-10-14 08:34:30 +00:00
Florian HENRY
ee67d2b1a8 fixnhish bom product stats 2020-10-14 10:30:39 +02:00
Florian HENRY
74155a49be finish BOM stat referent object 2020-10-14 08:42:57 +02:00
Florian HENRY
739de365c0 load stat_bom 2020-10-12 13:52:50 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
1838cf92ef Look and feel v12 2020-05-28 11:51:49 +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
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
b2a9791dca Fix pagination on pages "Related items" 2020-05-05 16:33:02 +02:00
Alexandre SPANGARO
c05ef16e0b Work on split module fournisseur 2020-03-22 05:51:14 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
1f4b639ba0 Debug MRP module 2020-02-20 17:44:03 +01:00
Laurent Destailleur
bd0666bf53 Update product.lib.php 2020-02-12 18:35:15 +01:00
ptibogxiv
f17c7f4cb3 fix for unit with rowid (netmeasure) 2020-02-11 20:21:53 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
 2019-11-29 11:42:08 +01:00
Laurent Destailleur
3acd0bc2ff FIX Reduce number of request for list of products 2019-11-29 11:32:09 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
496f93911f Merge pull request #11821 from Tim-Otte/develop 
NEW Extrafields support in product supplier prices
 2019-11-02 16:19:13 +01:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2019-10-23 04:04:32 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
Laurent Destailleur
f2d04fe55c Code comment 2019-10-09 11:51:10 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
fd37a81e19 FIX #11861 2019-09-27 20:02:33 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
1fa1b91916 Update product.lib.php 2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db Update product.lib.php 2019-06-14 13:38:52 +02:00
ptibogxiv
a30f029bbf Update product.lib.php 2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58 Fix measuring_units_string display function 2019-06-13 20:52:52 +02:00
Ion
b64cb4129f Add resources tab for products/services 2019-04-07 23:52:49 +02:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Philippe GRAND
6984cd25d8 update with html5 compliant code 2019-03-14 14:11:43 +01:00
Regis Houssin
1c3541295b FIX wrong class name "CUnits instead CMeasuringUnits" 2019-02-19 09:24:30 +01:00
florian HENRY
de87321c15 fix travcis 2019-02-13 10:28:08 +01:00
florian HENRY
5c059c897d fix travis (mosty for dev no conerne by my changes) 2019-02-13 09:21:14 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00