Commit Graph

55688 Commits

Author SHA1 Message Date
Laurent Destailleur
619b65e0b6 Fix warning 2016-09-22 11:06:39 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03 Fix size of warehouse and height of confirm box 2016-09-21 18:20:18 +02:00
Laurent Destailleur
494d4783a7 Fix tab works when editing prices 2016-09-21 18:13:27 +02:00
Laurent Destailleur
39c4feaef7 Enhancement for usage on smartphone 2016-09-21 03:54:54 +02:00
Laurent Destailleur
d759296c02 Fix color of amount 2016-09-21 01:39:05 +02:00
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00
Laurent Destailleur
2c42697cae Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:22 +02:00
Laurent Destailleur
f1bb69eecf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:03 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
b5dad8cfbf Better responsive 2016-09-21 00:29:19 +02:00
Laurent Destailleur
79ddc2458d Better center of left, center and right part of titles. 2016-09-20 12:51:09 +02:00
Laurent Destailleur
ead3990171 Better size of filter 2016-09-19 17:40:40 +02:00
Laurent Destailleur
891297d165 Fix alignement 2016-09-19 17:12:53 +02:00
Laurent Destailleur
c2f4bc90ab NEW Can sort on status reccurin invoice in list of template invoices. 2016-09-19 16:52:33 +02:00
Laurent Destailleur
10e9f4372b NEW Show total line (planned workload and time spent) on on list of
tasks.
2016-09-19 16:42:45 +02:00
Laurent Destailleur
64dc44b796 FIX Value of payment term and project are not set on correct default
value when invoice generated from template.
2016-09-19 16:27:01 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
079ed88119 Fix missing css 2016-09-19 13:57:18 +02:00
Laurent Destailleur
5602bcd440 NEW Add status Done on interventions 2016-09-19 13:09:50 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
Laurent Destailleur
6cae631a4f NEW Add REST API to read users 2016-09-19 02:13:16 +02:00
Laurent Destailleur
77e2037195 NEW Add REST API to read, create and delete agenda events 2016-09-19 02:02:45 +02:00
Laurent Destailleur
b076ea2985 Code comment 2016-09-19 00:49:29 +02:00
Laurent Destailleur
7ac1b712e0 Start to work on sepa mandate generation 2016-09-19 00:39:46 +02:00
Laurent Destailleur
95f2cae825 Start to work on sepa mandate generation 2016-09-19 00:26:30 +02:00
Laurent Destailleur
0c342284f0 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-18 22:01:14 +02:00
Laurent Destailleur
5fb55cc9de Fix css 2016-09-18 22:00:59 +02:00
Laurent Destailleur
c4626b0826 CSS 2016-09-18 21:48:00 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
46ce1d3a69 Uniformize code 2016-09-18 16:11:30 +02:00
Laurent Destailleur
537c6b0cc7 Uniformize code 2016-09-18 15:57:53 +02:00
Laurent Destailleur
13c3db08e7 Uniformize code and look and feel 2016-09-18 15:48:29 +02:00
Laurent Destailleur
7e24f449d2 Can filter on project category on project list 2016-09-18 15:36:38 +02:00
Laurent Destailleur
d1c4f02bf7 Uniformize code and style 2016-09-18 14:41:17 +02:00
Laurent Destailleur
a4c3a4588d FIX link "back to list" was not visible. 2016-09-18 14:12:49 +02:00
Laurent Destailleur
6093dfe333 Uniformize code 2016-09-18 12:33:30 +02:00
Laurent Destailleur
61d32b7fb6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-17 21:03:56 +02:00
Laurent Destailleur
97e396af69 Work on module website 2016-09-17 21:03:20 +02:00
Laurent Destailleur
407d9e6904 Merge pull request #5741 from atm-quentin/new_hook_stock_product_develop_dolibarr
NEW Hook on stock product card
2016-09-17 18:04:39 +02:00
Laurent Destailleur
3a0db4afed Merge pull request #5755 from defrance/patch-27
Prevent space separator in module definition
2016-09-17 17:55:51 +02:00
Laurent Destailleur
bef5c2748c Merge pull request #5756 from atm-maxime/fix_pgsql_supplierorder_list
FIX No ORDER BY needed for a COUNT sql, causes PGSQL error
2016-09-17 17:49:19 +02:00
Laurent Destailleur
7afdfd5a68 Merge pull request #5758 from joseplluis/patch-3
Minor fix: incorrect key translations
2016-09-17 17:48:01 +02:00
Laurent Destailleur
81590e3833 Merge pull request #5757 from IonAgorria/fix-sorder-insert
FIX: Wrong line insert trigger in supplier order
2016-09-17 17:47:16 +02:00
Laurent Destailleur
83ba44c418 Merge pull request #5759 from IonAgorria/fix-sorder-delete
FIX: Move order supplier deleteline code to line class
2016-09-17 17:44:33 +02:00
Ion Agorria
7fe0c4211c Move order supplier deleteline code to line class 2016-09-17 02:35:02 +02:00
Juanjo Menent
d0d14ea959 Merge pull request #5753 from olsesacl/4.0
FIX: #5699 Error when creating database backup dump file
2016-09-16 17:08:48 +02:00
Josep Lluís
1b05be0305 Minor fix: incorrect key translations
"Post" key doesn't exist: Changed to "PostOrFunction"
"Email" key doesn't exist: Changed to "EMail"
"DateCreate" changed to "DateCreateShort" in $arrayfields (with the same key in print_liste_field_titre function)
2016-09-16 17:07:01 +02:00
Laurent Destailleur
d0136f5c85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/websites/index.php
2016-09-16 01:23:54 +02:00