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

4300 Commits

Author SHA1 Message Date
Laurent Destailleur
57bb8bcfcd Disabled action are hidden with reason 2018-10-16 20:27:33 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop 
New: works with variants
 2018-10-16 20:08:17 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Juanjo Menent
194b3478f3 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	htdocs/product/class/product.class.php
 2018-10-15 13:40:42 +02:00
Laurent Destailleur
cca87f3d5a Fix phpcs 2018-10-15 13:27:17 +02:00
Laurent Destailleur
6ab037c766 Fix code comment 2018-10-15 13:26:18 +02:00
Laurent Destailleur
f59dba66e7 Fix phpcs 2018-10-15 13:23:35 +02:00
Juanjo Menent
58cc9aa918 Fix: found 1 blank lines before brace 2018-10-15 12:45:40 +02:00
Juanjo Menent
c2814948fb Fix: name of fields used into the search criteria must always start with "search_" 2018-10-15 11:48:55 +02:00
Juanjo Menent
e3643c7ab7 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-15 11:44:50 +02:00
Laurent Destailleur
7e68d8df1b
Update product.class.php 2018-10-14 16:47:30 +02:00
Laurent Destailleur
5654492ba8
Update product.class.php 2018-10-14 16:45:45 +02:00
Laurent Destailleur
db2e1e09e7
Merge branch 'develop' into patch-112 2018-10-14 16:44:36 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2018-10-13 14:29:51 +02:00
Philippe GRAND
9e494e65e0 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 19:04:02 +02:00
Philippe GRAND
357173f0ef Standardize and update code 2018-10-12 09:30:53 +02:00
Philippe GRAND
849a1a9400 Standardize and update code 2018-10-12 09:26:58 +02:00
atm-ph
79420593f4 Fix display 0 (as virtual stock) instead of empty string 2018-10-11 17:14:22 +02:00
Juanjo Menent
0976616401 Fix: Opening brace should be on a new line 2018-10-11 17:13:39 +02:00
Juanjo Menent
ab55ff2e2c New: works with variants: 
- Make the checkbox working correctly
 2018-10-11 15:44:23 +02:00
Laurent Destailleur
e6f179b6cb Fix look 2018-10-11 13:33:44 +02:00
Juanjo Menent
58be4ac7a3 New: works with variants: 
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
 2018-10-11 12:36:10 +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
Fernando Octavio García López
c7eb935cb8 FIX Fixed translatable field name in stock movement table 2018-10-10 22:57:08 -06:00
Laurent Destailleur
df0ec95b22 Code comment and better error message 2018-10-09 21:21:10 +02:00
Philippe GRAND
596dba9ce1 Standardize code 2018-10-06 12:14:47 +02:00
Philippe GRAND
b3925dd2bd Standardize code 2018-10-05 16:04:10 +02:00
Philippe GRAND
073ec85208 Standardize code 2018-10-05 15:51:08 +02:00
Philippe GRAND
da560289e3 Standardize code 2018-10-05 15:48:38 +02:00
Philippe GRAND
d2ec703b51 Standardize and update code 2018-10-04 09:24:57 +02:00
Laurent Destailleur
75b1cac33f FIX Pagination stats 2018-10-01 01:15:19 +02:00
Laurent Destailleur
d2e4752427 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-01 01:14:03 +02:00
Laurent Destailleur
d51eb1977a FIX Pagination stats 2018-10-01 01:10:42 +02:00
Philippe GRAND
574cfad48f Standardize and update code 2018-09-28 14:49:34 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
 2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php 2018-09-27 09:22:38 +02:00
gauthier
fc7c0ce521 FIX : need to filter on current entity on replenish 2018-09-24 16:23:44 +02:00
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class 2018-09-16 13:59:15 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
bed8674714
Merge pull request #9519 from frederic34/patch-14 
reduce complexity of libstatut inventory.class.php
 2018-09-16 08:54:22 +02:00
Frédéric FRANCE
d2bd16280e
reduce complexity of libstatut inventory.class.php 2018-09-15 22:20:47 +02:00
Frédéric FRANCE
5d87847b65
reduce complexity of libstatut product.class.php 2018-09-15 22:13:54 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Frédéric FRANCE
a36f41728f
deprecate formbarcode:form_barcode_type 2018-09-10 23:58:57 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type 2018-09-10 23:50:48 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00