Commit Graph

45660 Commits

Author SHA1 Message Date
Florian HENRY
41b0b57743 review || GETPOST("button_removefilter") 2015-02-08 11:01:27 +01:00
Florian HENRY
eea4815312 Display amount of line not total amount 2015-02-07 20:58:18 +01:00
Florian HENRY
9a7a5b9b20 review product stats list 2015-02-07 20:36:16 +01:00
Laurent Destailleur
3bdf8864a9 New: Add option MAXTABS_IN_CARD to limit number of visible tabs. 2015-02-07 04:24:31 +01:00
Laurent Destailleur
4a3e4d6ec9 Fix: back to project page 2015-02-07 04:04:56 +01:00
Laurent Destailleur
2c364dbe8c Fix filter on status 2015-02-07 03:54:00 +01:00
Laurent Destailleur
a21acdeb7c Enable select2 for users combo 2015-02-07 03:41:09 +01:00
Laurent Destailleur
7738478564 Fix bad order 2015-02-07 03:29:33 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
d812b2b7b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-07 03:12:21 +01:00
Laurent Destailleur
2f388949f6 Make a test with jsganttimproved 2015-02-07 03:11:35 +01:00
Laurent Destailleur
ba5d355eb3 Fix bad property 2015-02-07 02:14:45 +01:00
Laurent Destailleur
53453a63f5 Fix: pb when posting page due to apache limit 2015-02-07 01:45:09 +01:00
Laurent Destailleur
79ac620ab5 Fix label of status 2015-02-07 01:32:21 +01:00
Juanjo Menent
9d57f5b957 Trad: update es_ES from Transifex 2015-02-06 22:55:43 +01:00
Laurent Destailleur
553181a5d9 Fixed: Location for file storage from tab attached files was not at same
place than from tab images.
2015-02-06 21:26:41 +01:00
Laurent Destailleur
35129f2192 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly
supported.
Fix: No limit on ldap search on dolibarr side.
2015-02-06 16:33:33 +01:00
Laurent Destailleur
4c5fa7510c Fix bad translation key 2015-02-05 12:06:20 +01:00
Laurent Destailleur
b654ffb627 New: Add option SUPPLIER_ORDER_HIDE_VALIDATED. So a module can remove
this step. Useless when all users have permission to approve supplier
orers.
2015-02-05 11:58:40 +01:00
Laurent Destailleur
7d64d3d17b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-05 11:53:50 +01:00
Laurent Destailleur
556c27f834 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/stock/mouvement.php
2015-02-04 15:15:50 +01:00
Laurent Destailleur
4477a712d6 Fix: calendar was not using option START_WEEK. 2015-02-03 14:02:36 +01:00
Laurent Destailleur
a6e4fdd7c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-03 14:02:07 +01:00
Laurent Destailleur
6fca75c977 Sync doc files 2015-02-03 13:57:05 +01:00
Laurent Destailleur
0b01fa8eb8 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-03 13:45:10 +01:00
Laurent Destailleur
6d751ad63b Merge pull request #2317 from GPCsolutions/contributing
Added branches information to contributing guidelines
2015-02-03 13:44:43 +01:00
Laurent Destailleur
91626cfc92 Merge pull request #2316 from mrsof/develop
FIX : Update action return PHP Fatal error: Using $this when not in object context
2015-02-03 13:44:17 +01:00
Laurent Destailleur
f865534b4c Fix some pdf differences 2015-02-03 13:43:37 +01:00
Laurent Destailleur
7ac35593e1 Merge pull request #2314 from aspangaro/3.7-Accountancy
FIXED Accountancy clean code
2015-02-03 13:11:16 +01:00
Laurent Destailleur
f10a4bbdbe Merge pull request #2312 from frederic34/patch-5
Can't use function return value in write context
2015-02-03 13:06:13 +01:00
Laurent Destailleur
96215ccea5 Fix bad operator for and 2015-02-03 13:05:28 +01:00
Laurent Destailleur
41cabeee59 Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 12:40:49 +01:00
Laurent Destailleur
d626d073dc Merge pull request #2304 from frederic34/tooltip
Tooltip
2015-02-03 12:32:40 +01:00
Laurent Destailleur
43f3d5805e Merge pull request #2301 from frederic34/patch-3
Update 3.7.0-3.8.0.sql
2015-02-03 12:31:06 +01:00
Laurent Destailleur
fe674f8fd5 Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 12:21:30 +01:00
Laurent Destailleur
077fafdb7d Remove log 2015-02-03 12:20:36 +01:00
Laurent Destailleur
01541e4152 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php
2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
Raphaël Doursenaud
8fcf0de5d1 Added branches information to contributing guidelines 2015-02-03 10:51:05 +01:00
Sof
493732bdc3 Update action returnb PHP Fatal error: Using $this when not in object context 2015-02-03 10:45:00 +01:00
Laurent Destailleur
75f451ccc7 Fix class not found 2015-02-03 08:59:57 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
6e57e41fb0 Translation 2015-02-02 21:55:07 +01:00
Laurent Destailleur
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +01:00
Laurent Destailleur
7a9a319da7 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-02 21:45:02 +01:00
Laurent Destailleur
5aecfa4cdb Translation 2015-02-02 21:44:40 +01:00
Laurent Destailleur
82dda354cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-02 21:33:30 +01:00
Laurent Destailleur
e0f86f0270 Oubli sur option PROJECT_HIDE_TASKS 2015-02-02 21:33:09 +01:00
Juanjo Menent
b513aa5455 Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:32:52 +01:00
Juanjo Menent
2389e332db Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:28:27 +01:00