lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,175 Commits 43 Branches 150 Tags 886 MiB
7e0b99d5ab
Commit Graph

55175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
7e0b99d5ab Little changes to PHPDoc comment block 2016-08-11 15:23:00 +02:00
Laurent Destailleur
7a53fa6be6 Use shadow for hover of stats numbers 2016-08-09 15:56:55 +02:00
Laurent Destailleur
6c5849fc87 Fix field too small 2016-08-09 15:56:39 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
29fdebe0d9 Fix list of lot 2016-08-09 13:21:30 +02:00
Laurent Destailleur
7b6755cfcd Fix several errors in search an sorting in stock by lot view 2016-08-09 13:14:33 +02:00
Laurent Destailleur
7667dc735e Fix several errors in search an sorting in stock by lot view 2016-08-09 13:11:56 +02:00
Laurent Destailleur
f1ee2bdddf Remove deprecated field 2016-08-09 13:10:34 +02:00
Laurent Destailleur
7c7bcac3c4 Fix lost filter 2016-08-08 22:00:01 +02:00
Laurent Destailleur
2262c1c7dd Fix code generator 2016-08-08 21:58:47 +02:00
Laurent Destailleur
4b13a11d9c Key must be first field 2016-08-08 20:46:08 +02:00
Laurent Destailleur
57cbda416b Minor fix on stock 2016-08-08 20:41:49 +02:00
Laurent Destailleur
437b796928 Fix search on product ref 2016-08-08 20:34:55 +02:00
Laurent Destailleur
2133b1c3b5 NEW Table with list of lots/serial can be viewed (module product batch). 2016-08-08 20:31:03 +02:00
Laurent Destailleur
54b47d7f4f Fix edit of page in module website 
Conflicts:
	htdocs/websites/class/website.class.php
 2016-08-08 19:09:37 +02:00
Laurent Destailleur
fb3f6972eb Work on module website 
Conflicts:
	htdocs/websites/index.php
 2016-08-08 18:29:24 +02:00
Laurent Destailleur
50a7046bd4 Fix edit of page in module website 2016-08-08 18:25:37 +02:00
Laurent Destailleur
13bbd5059b Work on module website 2016-08-08 14:21:43 +02:00
Laurent Destailleur
3f87b0c225 NEW Show photo of contacts on thirdparty card. 2016-08-06 00:04:24 +02:00
Laurent Destailleur
5c0b02e46d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-05 23:40:11 +02:00
Laurent Destailleur
034b08ce56 NEW Add option "Hide images in Top menu". 2016-08-05 23:40:00 +02:00
Laurent Destailleur
d2c55330e9 NEW Add option "Hide images in Top menu". 2016-08-05 23:34:59 +02:00
Laurent Destailleur
126d9ae6bf Merge pull request #5586 from atm-florian/dev_NEW_ClassOrderDeliverStatusOnStockVentil 
NEW : Add workflow to calculated supplier order status on stock dispatch
 2016-08-05 18:15:04 +02:00
florian HENRY
0176acd08f fix travis 2016-08-05 16:15:30 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
851f8369cf Fix padd right 2016-08-05 13:22:28 +02:00
Laurent Destailleur
72e601d30f git push origin developMerge branch 'marcosgdf-remove-mysql-driver' into develop 2016-08-05 13:12:49 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of 
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
 2016-08-05 13:12:43 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
florian HENRY
1e929e647d better management of dispatch status 2016-08-05 10:02:36 +02:00
florian HENRY
0780188f4e taking account @eldy remarks 2016-08-05 09:46:17 +02:00
florian HENRY
a39290022f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_NEW_ClassOrderDeliverStatusOnStockVentil

Conflicts:
	htdocs/langs/en_US/workflow.lang
 2016-08-05 09:34:27 +02:00
Laurent Destailleur
4cf01bc685 Fix code comment 2016-08-05 04:48:30 +02:00
Laurent Destailleur
57a542d52d Fix: we still need gd 2016-08-05 04:45:05 +02:00
Laurent Destailleur
e1e8254bcf Fix thumbs are using same extension than original. 2016-08-05 04:31:19 +02:00
Laurent Destailleur
1b10e27618 Fix bad link 2016-08-05 04:20:38 +02:00
Laurent Destailleur
63562beb36 Fix move translation key into source language 2016-08-05 01:19:20 +02:00
Laurent Destailleur
544d5af49b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
7211542e41 Merge pull request #5569 from olsesacl/develop-show-preview-documents 
NEW Preview documents
 2016-08-05 01:13:35 +02:00
Laurent Destailleur
c73f962b28 Merge pull request #5585 from atm-florian/dev_NEW_workflow_ClassPropalBillOnBillValidation 
NEW : Add workflow to classifed propal bill on invoice validation
 2016-08-05 00:46:12 +02:00
Laurent Destailleur
d72d6de9f1 git push origin developMerge branch 'atm-florian-dev_add_color_on_select_product' into develop 2016-08-05 00:44:35 +02:00
Laurent Destailleur
4e483c675e Merge branch 'dev_add_color_on_select_product' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_add_color_on_select_product

Conflicts:
	htdocs/core/class/html.form.class.php
 2016-08-05 00:44:24 +02:00
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
 2016-08-05 00:42:40 +02:00
Laurent Destailleur
40723b264a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-05 00:37:10 +02:00
Laurent Destailleur
c2e81b6edb Fix colspan 2016-08-05 00:36:58 +02:00
Laurent Destailleur
112b945e6b Merge pull request #5583 from atm-florian/3.9 
FIX : update limit stock on product stock
 2016-08-05 00:34:32 +02:00
Laurent Destailleur
5555037346 Merge pull request #5580 from simnandez/4.0 
NEW Add Panama datas
 2016-08-05 00:34:05 +02:00
Laurent Destailleur
bdf779dfd2 Merge pull request #5578 from aspangaro/4.0-p37 
Uniformize presentation
 2016-08-05 00:32:49 +02:00