lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

273 Commits

Author SHA1 Message Date
Frédéric FRANCE
18e08420f4
Update combinations.php 2019-11-26 00:01:06 +01:00
Cédric
83de0fa7c1
Add the choice to delete the product linked 2019-11-23 18:03:46 +01:00
Cédric
d647479794
Do not delete product automaticaly (unlink only) 2019-11-23 17:17:25 +01:00
Cédric
31cfc9cd35
Add field reference in form 2019-11-23 17:04:14 +01:00
stickler-ci
7a3f6c362d Fixing style errors. 2019-11-23 15:23:31 +00:00
Cédric
6086ecef86
Can add already existing product as variant 
ONLY if the reference is forced
 2019-11-23 16:14:21 +01:00
Cédric
3aef39c64d
New can customize the reference of a combination 2019-11-23 13:45:58 +01:00
Cédric
398f0e00f7
inject $user for createProductCombination 2019-11-17 01:27:23 +01:00
Cédric
a7f42b3fdf
Inject $user for createProductCombination 2019-11-17 01:25:44 +01:00
Cédric
40e4af234d
Inject $user instead of global var 2019-11-17 01:24:07 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Cédric
df4bcdcb94
Edit updateProperties to inject $user 2019-11-09 14:13:14 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a7797ba1da
clean indent in variants directory 2019-10-26 20:53: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
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Laurent Destailleur
9871dd8770 Debug variants 2019-10-12 15:27:06 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Laurent Destailleur
684e09fdcd NEW Add function isValidVATID() 2019-04-23 22:49:33 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +01:00
Laurent Destailleur
6f0d5fcf3f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/variants/combinations.php
 2019-02-27 01:25:25 +01:00
Laurent Destailleur
a48e9fdba4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-27 01:23:26 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Frédéric FRANCE
2ad91213b2
Update combinations.php 2019-02-24 12:09:57 +01:00
Frédéric FRANCE
bc395b247a
fix html5 in variant 2019-02-16 08:00:16 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found 2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Regis Houssin
8f4c452075 FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:34:26 +01:00
Philippe GRAND
a59a4c60e0 FIX : Typo errors 2018-11-26 16:09:05 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Juanjo Menent
34118bcf20 New: works with variants: 
- Multiprices compatibility
 2018-10-19 12:02:14 +02:00
Juanjo Menent
1714bce8a1 New: works with variants: 
- Better function name
 2018-10-19 08:53:01 +02:00
Juanjo Menent
52ad5c5565 New: works with variants: 
-To edit child price and weight impacts better to see in tab the father price and weight
 2018-10-18 12:21:39 +02:00
Juanjo Menent
c588f5e6c0 New: works with variants: 
-Child label with combination labels
 2018-10-18 10:55:27 +02:00
Juanjo Menent
6c76f9517f New: works with variants: 
-Child label with combination labels
 2018-10-18 10:26:21 +02:00
Juanjo Menent
fd989230a4 New: works with variants: 
-Child label change if parent changes
 2018-10-18 09:09:42 +02:00
Laurent Destailleur
57bb8bcfcd Disabled action are hidden with reason 2018-10-16 20:27:33 +02:00
Juanjo Menent
ab55ff2e2c New: works with variants: 
- Make the checkbox working correctly
 2018-10-11 15:44:23 +02:00
Juanjo Menent
2ef0e95586 New: works with variants: 
- If product is parent showing stock of childs and not itself
- Add function hasVariants for know if product has variants
 2018-10-11 12:08:50 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Frédéric FRANCE
aab617aeb3
remove deprecated 2018-09-09 18:38:48 +02:00
Frédéric FRANCE
0e0db9d1ee
remove deprecated 2018-09-09 15:52:55 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing 2018-08-31 21:39:23 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Laurent Destailleur
5effcd222f
Merge pull request #9150 from frederic34/variant 
code cleaning
 2018-08-21 13:21:11 +02:00
Philippe GRAND
a31ad5af3d standardize code 2018-08-17 17:55:00 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
cb53366955
Merge remote-tracking branch 'upstream/develop' into variant 2018-08-07 16:55:50 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
Philippe GRAND
59cd0a5e5e uniformize 2018-08-04 15:58:05 +02:00
Philippe GRAND
541e919ae0 Clean and update code 2018-07-27 14:49:33 +02:00
Frédéric FRANCE
b90d125fda
trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
b87c3b80af
code cleaning 2018-07-25 09:36:34 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Frédéric FRANCE
455f809968
Update admin.php 2018-05-26 09:40:00 +02:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
fappels
db76fd7895 Fix delete all product variants of a parent product 
User object missing
 2018-05-02 22:33:23 +02:00
Frédéric FRANCE
6fc444e045
we can see what we are doing 2018-04-24 12:08:17 +02:00
Frédéric FRANCE
5f4e2dc565
variant on services 2018-04-24 11:01:17 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44 Look and feel v8 2018-04-18 02:10:23 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
Laurent Destailleur
21c65f812a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:20 +02:00
Frédéric FRANCE
a95bc76afb
Update combinations.php 2018-04-11 12:10:58 +02:00
Frédéric FRANCE
bc7623d383
Update getCombinations.php 2018-04-11 12:05:23 +02:00
Frédéric FRANCE
2c76a6cd80
Update combinations.php 2018-04-11 11:44:22 +02:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
BadPixxel
836054a8b3 BugFix Issue #8261: Variants module. Combinations cannot be edited 2018-03-10 14:51:24 +01:00
Laurent Destailleur
a833c271e1 Missing user 2018-03-10 12:37:44 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
ae906270f3 Debug module variant 2017-11-26 18:43:43 +01:00
Laurent Destailleur
2c07886360 Debug module variant 2017-11-26 15:08:00 +01:00
Laurent Destailleur
1ec6c13ece Debug module variant 2017-11-26 10:13:32 +01:00
Laurent Destailleur
776f999b71
Merge branch 'develop' into develop_update_tablednd 2017-11-17 15:10:09 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
fappels
14bc066454 Update for new tablednd compatibility 2017-11-07 16:25:57 +01:00
Benoît Peccatte
0ffffa3019 Add a parameter to specify variant identifier separator 2017-09-25 12:05:12 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
ae444b5781 Fix travis error 2017-08-01 01:28:07 +02:00
florian HENRY
f5718106a6 FIX : 7213 2017-07-28 09:45:23 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
4dc7d5cd8d Fix : tooltip on bank in customer invoice card 2017-05-14 21:20:35 +02:00
Laurent Destailleur
9b4b096e86 Debug variant module 2017-05-10 12:35:05 +02:00
Laurent Destailleur
d74baea1d3 Fix error management on direct print 2017-04-12 13:01:41 +02:00
Laurent Destailleur
aa47575b13 Serious debug of variant module. No more fu.. js errors on smarpthone. 2017-04-07 12:31:08 +02:00
Laurent Destailleur
ea44e14b60 Start debug the variant module 2017-04-07 11:01:12 +02:00
Laurent Destailleur
e8a1f0ba46 Uniformize code 2017-03-12 17:10:32 +01:00
Laurent Destailleur
4ca634b41c Better look and feel 2017-03-11 12:04:28 +01:00
Laurent Destailleur
6fef6ac2fb Optimize code and performance of module variant 2017-02-08 14:07:54 +01:00
Laurent Destailleur
d5b10a18b7 Debug module variant 2017-02-08 12:52:31 +01:00
Laurent Destailleur
e1a6e6e4ab Rename "attributes" into "variants" to avoid confusion with extrafields 2017-02-08 12:37:38 +01:00