Commit Graph

4271 Commits

Author SHA1 Message Date
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +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
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
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
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
97c740f510 Merge branch 'develop' of github.com:grandoc/dolibarr into develop 2018-09-06 19:28:10 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Laurent Destailleur
2a471df828 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/pdf.lib.php
2018-09-05 20:39:38 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Laurent Destailleur
19431a94ba Code style 2018-09-05 14:37:44 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10
Create index.html
2018-09-05 14:15:22 +02:00
Frédéric FRANCE
2015268b7e
Create index.html 2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html 2018-09-04 22:05:06 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00
Philippe GRAND
47b6374abc Standardize and update code 2018-09-04 13:45:20 +02:00
Philippe GRAND
42565e722e Standardize and update code 2018-09-04 13:37:00 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Laurent Destailleur
bb5fae0e46 Fix eol 2018-09-02 15:30:56 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore 2018-09-02 14:01:37 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore 2018-09-02 13:38:11 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore 2018-09-02 11:12:07 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore 2018-09-02 09:57:19 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Philippe GRAND
db32d8903e Standardize and Update code 2018-09-01 23:20:20 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00