lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
117,307 Commits 43 Branches 150 Tags 886 MiB
5bbfdbb775
Commit Graph

313 Commits

Author SHA1 Message Date
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +01:00
Marc de Lima Lucio
e989371651 FIX: better error management at product selling price update 2022-03-08 14:49:26 +01:00
Laurent Destailleur
626a5b90f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:22:49 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923 FIX wieght is loose if it's comma on combinations 2022-02-15 11:31:09 +01:00
Laurent Destailleur
142e9473c5 Responsive 2021-11-07 18:28:59 +01:00
Laurent Destailleur
f5edd25f6d Clean code 2021-11-07 18:14:49 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:04:17 +01:00
stickler-ci
5c10cd5ba9 Fixing style errors. 2021-11-02 13:20:41 +00:00
BadPixxel
98929f2dba
FIX: Status propagation from Parent Product 
toSell or toBuy Status propagation should be done only when parent is updated. 

Otherwise, any modification made on the parent will overwrite the specific configuration made at the child level.
 2021-11-02 14:16:55 +01:00
Laurent Destailleur
cee573cf96
Update ProductCombination.class.php 2021-10-31 17:42:43 +01:00
Gauthier PC portable 024
1e45b9b1cd FIX : We need a default price base type in variant creation case with multiprices when parent has been created with only one level price 2021-10-25 15:25:58 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
lmarcouiller
3a1a688ab2 Fix #18604 : fix percentage on variant product 2021-09-10 15:03:08 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
000c32c137 FIx #18313 2021-08-02 20:20:52 +02:00
Laurent Destailleur
c2b910f6ed Clean code 2021-06-11 15:08:54 +02:00
Laurent Destailleur
7e95c5ec20 Clean code 2021-06-08 11:40:50 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
stickler-ci
a8136a00b1 Fixing style errors. 2021-04-26 15:07:41 +00:00
jpb
8d07b43ccd space stickler 2021-04-26 17:05:21 +02:00
jpb
09d68dd7a6 fix the productCombination class on updatePrice 2021-04-26 17:00:53 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
537e979e5a Debug v13 2021-03-24 02:06:16 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
f6145a119f Fix #yogosha5679 2021-03-20 18:58:34 +01:00
Laurent Destailleur
725439c5e7
Merge pull request #16806 from dolibit-ut/patch-110 
Update create.php
 2021-03-18 22:52:34 +01:00
Laurent Destailleur
74506232e4
Merge pull request #16805 from dolibit-ut/patch-109 
Update card.php
 2021-03-18 22:51:23 +01:00
UT from dolibit
8844f4fda9
Update create_val.php 
$help_url = 'EN:Module_Products#Variants';

llxHeader('', $title, $help_url);
 2021-03-18 20:57:09 +01:00
UT from dolibit
b7aed07284
Update create.php 
$help_url = 'EN:Module_Products#Variants';

llxHeader('', $title, $help_url);
 2021-03-18 20:55:41 +01:00
UT from dolibit
3ca9bee5de
Update card.php 
$help_url = 'EN:Module_Products#Variants';

llxHeader('', $title, $help_url);
 2021-03-18 20:52:24 +01:00
Laurent Destailleur
8aefb1b641
Merge pull request #16426 from josemariagomezroncero/patch-9 
NEW Set status of all variant when setting status of parent
 2021-02-26 13:25:04 +01:00
Laurent Destailleur
afcc3cb3e6
Update ProductCombination.class.php 2021-02-26 13:24:30 +01:00
Laurent Destailleur
77356afd03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 13:22:28 +01:00
Laurent Destailleur
9e202467e0 Code comment 2021-02-26 13:22:13 +01:00
stickler-ci
2cbdbf4f60 Fixing style errors. 2021-02-26 12:12:30 +00:00
Frédéric FRANCE
db871994fb
code syntax variants webservice directory 2021-02-26 13:10:10 +01:00
josemariagomezroncero
c0a489ec1a
Update ProductCombination.class.php 
Product dont update product variation statut when desactivate for sale.
 2021-02-24 23:16:46 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
stickler-ci
0e629204f2 Fixing style errors. 2020-12-21 17:49:49 +00:00
ptibogxiv
196fb07830
Fix edit variant v13+ 
after add, edit have same mistakes
 2020-12-21 18:47:43 +01:00
Laurent Destailleur
48dfc90c8b
Update create.php 2020-12-21 18:06:02 +01:00
ptibogxiv
94cf393f7f
Update combinations.php 2020-12-21 15:43:45 +01:00
ptibogxiv
cba10bbd4d
FIX: create form variant 
https://github.com/Dolibarr/dolibarr/issues/15759
 2020-12-21 15:18:55 +01:00
Laurent Destailleur
379bca0b61 Clean code 2020-11-30 13:18:23 +01:00
Laurent Destailleur
2de3a3d143 Clean dead code 2020-11-30 13:02:46 +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
ATM john
0074160bba Fix var misstake 2020-11-02 10:24:08 +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
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
6e2a9dc0c9 Fix error management in Stripe 2020-09-24 21:54:21 +02:00
Laurent Destailleur
43ed2c6c20 Fix phpunit 2020-09-21 12:35:20 +02:00
Laurent Destailleur
c5aff1769a
Merge pull request #14631 from c3do/patch-3 
NEW ref_ext for Attributes and Combinations
 2020-09-20 17:50:51 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Cédric
0d20b6645d
Update ProductCombination.class.php 2020-09-17 12:37:20 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
c0ef7e8f13 fix phpcs 2020-09-14 04:23:14 +02:00
Laurent Destailleur
48e34c2069 Add int 2020-09-12 15:53:18 +02:00
Cédric
3209708e30
Update ProductCombination.class.php 2020-09-10 13:56:58 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
stickler-ci
61903a1079 Fixing style errors. 2020-09-07 15:24:35 +00:00
Cédric
5992641360
Merge branch 'develop' into patch-3 2020-09-07 17:22:18 +02:00
Laurent Destailleur
753e68b5d9 Fix phpcs 2020-09-07 12:18:00 +02:00
Laurent Destailleur
1f58942e11 Fix phpcs 2020-09-07 10:57:41 +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
be1460e3eb Fix doxygen 2020-09-07 02:49:39 +02:00
stickler-ci
af91013506 Fixing style errors. 2020-09-06 15:52:02 +00:00
Cédric
03e9e17be4
Merge branch 'develop' into patch-3 2020-09-06 17:50:54 +02:00
Laurent Destailleur
f2a16d860e Enhance method fetchByFkProductChild() 2020-09-04 14:05:35 +02:00
Laurent Destailleur
4383f1d00c
Update ProductCombination.class.php 2020-09-04 13:50:22 +02:00
stickler-ci
8d6c19a432 Fixing style errors. 2020-09-04 10:10:37 +00:00
Cédric
b841a4354e
NEW ref_ext for Attributes 2020-09-04 12:06:09 +02:00
Cédric
925a1475a1
add ref_ext to ProductCombination.class.php 2020-09-04 11:01:47 +02:00
Laurent Destailleur
9293d1917a
Update ProductCombination.class.php 2020-09-03 12:37:30 +02:00
Laurent Destailleur
1d3c54dd64
Update ProductCombination.class.php 2020-09-03 12:36:57 +02:00
John Botella
cd952f7427 Fix and factor fetch combination price level 2020-09-02 16:24:22 +02:00
Laurent Destailleur
79802be58b Fix phpcs 2020-08-18 00:29:13 +02:00
Laurent Destailleur
4f93de6d0b Fix phpcs 2020-08-17 23:30:53 +02:00
Laurent Destailleur
6662e216f7 Fix phpcs 2020-08-17 21:59:50 +02:00
Laurent Destailleur
5be10f133c Fix several regressions with variants creation 2020-08-17 13:55:18 +02:00
Laurent Destailleur
96d4eeb8be Fix syntax error 2020-08-17 12:24:32 +02:00
Laurent Destailleur
15e7cd0fb3 Fix doxygen 2020-08-17 05:54:22 +02:00
Laurent Destailleur
cf73c2d8e1 Fix travis 2020-08-17 05:26:32 +02:00
Laurent Destailleur
9712e3d28f Fix travis 2020-08-17 05:09:27 +02:00
Laurent Destailleur
b7c38f4617
Merge pull request #14433 from c3do/patch-1 
NEW Triggers Attributes and Attributes values
 2020-08-16 23:45:32 +02:00
stickler-ci
959ccce777 Fixing style errors. 2020-08-13 09:48:28 +00:00
John Botella
2405082bb1 Merge branch 'develop_declinaison_price_multiple_merge' of github.com:atm-john/dolibarr into develop_declinaison_price_multiple_merge 2020-08-13 11:46:07 +02:00
John Botella
4e1f554c15 Fix - add variation price fallback behavior 2020-08-13 11:43:33 +02:00
stickler-ci
1cc673a9c6 Fixing style errors. 2020-08-12 08:53:24 +00:00