lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,145 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-4
Commit Graph

513 Commits

Author SHA1 Message Date
Laurent Destailleur
9a13ebfdb8 Fix look and feel v13 2021-03-10 11:08:39 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Christophe Battarel
83350cde8f remove hidden constant MAIN_ADVANCE_NUMLOT 2021-03-04 15:40:23 +01:00
Laurent Destailleur
84219689a6 Look and feel v14 2021-02-27 02:00:00 +01:00
Frédéric FRANCE
96b0f3a25c
code syntax directory 2021-02-26 16:19:52 +01:00
Frédéric FRANCE
8029a3317f
Merge remote-tracking branch 'upstream/develop' into product_code_syntax 2021-02-26 16:11:34 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr 
differentiate serial numbers from lot management
 2021-02-26 15:06:35 +01:00
Frédéric FRANCE
fa7cd70052
code syntax product directory 2021-02-26 14:25:17 +01:00
Laurent Destailleur
2670d4fc17 Look and feel v14 2021-02-26 11:00:58 +01:00
Christophe Battarel
75298b4ac6 fix for stickler 2021-02-25 16:00:42 +01:00
Christophe Battarel
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
Laurent Destailleur
4d42fa2a37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formaccounting.class.php
 2021-01-17 11:34:19 +01:00
Laurent Destailleur
ee4084ef1b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/card.php
 2021-01-16 19:09:46 +01:00
Frédéric FRANCE
11100b3017
missing default value 2021-01-13 15:16:43 +01:00
stickler-ci
e012ce242d Fixing style errors. 2021-01-11 16:17:43 +00:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
zuiko
50461931b0
Update card.php 
$type replaced by $fk_barcode_type in
$tmpcode = $modBarCodeProduct->getNextValue($object, $type);
in order to set it
 2021-01-09 01:13:02 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/card.php
 2020-12-08 22:27:27 +01:00
Florian Mortgat
617c9f7ea9 FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML 2020-12-08 09:30:31 +01:00
Florian Mortgat
f871ade545 FIX 12.0 - the stringent XSS prodection provided by 'alphanohtml' causes problems with some clients who used basic tags (bold, italic, underline) in product labels. Using 'restricthtml' instead could be a good compromise. 2020-12-07 15:15:41 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
BENKE Charlene
5b40950f50 Update card.php 
add on card
 2020-11-26 12:45:06 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +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
Laurent Destailleur
d8753ea224 Fix trans 2020-11-16 14:15:54 +01:00
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
Laurent Destailleur
9595d56235
Merge pull request #15186 from fappels/13_fix_delete_product_ajax 
Fix delete product using ajax
 2020-10-27 20:03:00 +01:00
Francis Appels
828df6c134 Fix delete product using ajax 2020-10-27 19:45:12 +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
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
a6fe03bd14 Fix doc 2020-10-04 23:30:41 +02:00
Laurent Destailleur
cab2c24e27
Merge branch 'develop' into patch-43 2020-10-03 15:51:38 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
 2020-10-01 19:43:23 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
stickler-ci
e558dc3f27 Fixing style errors. 2020-10-01 07:48:24 +00:00
John Botella
c16cd91d8e FIX default accountancy values and posted values 2020-10-01 09:40:11 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
baa46cd502 Fix syntax error 2020-09-16 02:53:44 +02:00
stickler-ci
b3f78100bf Fixing style errors. 2020-09-15 23:01:00 +00:00
Laurent Destailleur
9e494d0bb3
Update card.php 2020-09-16 00:59:23 +02:00
stickler-ci
ad84aaacc6 Fixing style errors. 2020-09-14 09:01:11 +00:00
ptibogxiv
de31920f28
NEW add state origin for product 
usefull for food, fruits or vegetables  or regional product

soon in other PR i will push filter by state or country in product list
 2020-09-14 10:57:51 +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
Christian Foellmann
821e7e2894 set default unit to PRODUCT_USE_UNITS value 2020-08-10 15:39:05 +02:00
florian HENRY
164e3bff2c add formConfirm hook 2020-07-31 15:23:26 +02:00
Laurent Destailleur
a155b20b2f Trans 2020-07-10 16:27:59 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/card.php
	htdocs/ticket/card.php
 2020-06-06 11:51:39 +02:00
Laurent Destailleur
2344435416 Fix XSS CWE-ID CWE-79 2020-06-05 23:41:29 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a25ed0e041
add new rule 2020-05-21 01:56:06 +02:00
Anthony Berton
485ef522d2 Add option HT TTC créate product 2020-05-03 19:47:10 +02:00
Pierre Ardoin
19c85785f7
Fix 2020-04-16 13:26:55 +02:00
Pierre Ardoin
e85b4a5a20
FIX Directory Issue with Multicompany 
Before : Cannot show documents added entity who created the product/service

Now : show all files. 

Warning : all products must be generated in $object->entity directory and not in $conf->entity.
 2020-04-16 12:15:41 +02:00
Laurent Destailleur
549b126eff Look and feel v12 2020-04-12 21:36:57 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
50790a7f36 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/filefunc.inc.php
 2020-04-05 03:44:06 +02:00
atm-quentin
9a92545d8d FIX missing default accountancy product buy code 2020-03-30 14:28:22 +02:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5 FIX Bad position of total in column 2020-03-27 19:08:39 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
Laurent Destailleur
f38134e44d Fix non transversable var 2020-03-12 12:42:34 +01:00
Laurent Destailleur
dfe947885c FIX params of setEventMessage($langs->trans('ErrorProductClone')... 2020-03-12 12:40:28 +01:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +01:00
Laurent Destailleur
fa16063875 Fix bad accounting code set 2020-02-18 22:39:01 +01:00
Laurent Destailleur
31ae0bc06e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/product/card.php
 2020-02-18 22:38:30 +01:00
gauthier
523d09536c FIX : must be == and not = 2020-02-17 12:20:19 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
ptibogxiv
558ccdd8b9
Update card.php 2020-02-11 20:20:34 +01:00
ptibogxiv
5459e4b821
Fix netmeasure update and display 
nb: netmeasure is for real weight, volume or piece;

 i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
 2020-02-11 20:11:37 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
Laurent Destailleur
b78f310508 Reponsive 2019-12-04 15:49:22 +01:00
Laurent Destailleur
bde917d7fc Fix responsive 2019-12-04 15:09:20 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
d338a054eb Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-12-01 00:41:23 +01:00
Laurent Destailleur
a2a96f8796 # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 00:41:11 +01:00
Norbert Penel
e3fb27e3fc
Default type missing for add links from module builder 
BOM links to add product don't precise the type (from common object)
 2019-11-30 19:34:22 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
3300446cbf Fix td colspan 2019-11-18 14:13:51 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
8976bd7c9b Fix setup of accounting account 2019-11-11 19:05:42 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
8d21144521 Beautify select of products in vendor record 2019-10-24 20:33:16 +02:00
Laurent Destailleur
f0355b3057 Debug option PRODUCT_ADD_NET_MEASURE 2019-10-23 02:58:39 +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
Laurent Destailleur
48f5970c7a Debug net measure 2019-10-21 14:43:39 +02:00
Laurent Destailleur
24dc7fb667
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices 
NEW add clone customers prices in clone product or service
 2019-10-20 13:27:50 +02:00
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +02:00
VESSILLER
801092d848 NEW add clone customers prices in clone product or service 2019-10-18 15:10:22 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
b60ddc255c Removed useless html tags 2019-10-16 14:17:53 +02:00
ptibogxiv
2b9be13a7c
Update card.php 2019-10-09 15:26:55 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +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
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/card.php
 2019-10-03 17:53:59 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype 
FIX : change product type must be allowed if we activate hidden conf
 2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php 2019-10-01 14:41:25 +02:00
gauthier
2167e7ed98 FIX : hidden conf to prevent from changing product_type 2019-10-01 09:12:51 +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
gauthier
d40534e8fa FIX : change product type must be allowed if we activate hidden conf 2019-09-19 15:21:52 +02:00
Christophe Battarel
1cfd5615d3 resolv conflict 2019-09-05 16:10:23 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
815a467eb7 Debug clone of products 2019-05-22 19:54:03 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
Laurent Destailleur
aa9184905a FIX Duration is lost when editing 2019-04-25 00:11:08 +02:00
Christophe Battarel
f167ad910e camelCase and generic cloneCategories function 2019-04-05 11:30:51 +02:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
1a05cdfaa1 Fix regressions in selecting duration of service 2019-03-19 11:42:50 +01:00
Christophe Battarel
7bc0260661 begin factorization of categories cloning 2019-03-18 14:15:55 +01:00
ptibogxiv
8657ff034b
Update card.php 2019-03-18 13:48:16 +01:00
Frédéric FRANCE
5e6d9691e4
phpcs fix 2019-03-16 19:12:45 +01:00
Laurent Destailleur
e7543a26b1
Merge branch 'develop' into patch-1 2019-03-16 14:22:36 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Christophe Battarel
3215e066e4 copy linked categories when cloning a product 2019-03-11 10:00:44 +01:00
Frédéric FRANCE
a1d2d3bddc
replace html code by html5 2019-02-24 11:18:55 +01:00
Frédéric FRANCE
b766204690
wip 2019-01-30 22:53:47 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Alexandre SPANGARO
64975b3b9e NEW: When you create product or service, sell accountancy account by default are proposed 2019-01-28 22:27:55 +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
12e75cb8c9
Merge pull request #10401 from aspangaro/10.0_accountancy2 
NEW: Automatically binding for intra/export accountancy code in customer list
 2019-01-27 18:06:08 +01:00