Commit Graph

46503 Commits

Author SHA1 Message Date
Laurent Destailleur
b82eabe25f Code comment 2016-05-19 18:52:12 +02:00
Laurent Destailleur
7087b650d0 More precise parameter parameter targetwithdetails 2016-05-19 17:37:06 +02:00
Laurent Destailleur
d723f26661 Fix css 2016-05-19 13:32:06 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
fd38db388a Rename box into widget 2016-05-19 10:05:02 +02:00
Laurent Destailleur
400572e18a Fix column size 2016-05-18 21:04:37 +02:00
Laurent Destailleur
4c2098b667 Fix duplicate table title 2016-05-18 20:58:29 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Laurent Destailleur
7cca4f3e8a Merge pull request #5211 from defrance/patch-4
enhance rappro feature
2016-05-18 20:38:07 +02:00
Laurent Destailleur
12a5fbbea7 Merge pull request #5191 from FHenry/3.8
Fix email template edition
2016-05-18 20:35:42 +02:00
Laurent Destailleur
85cc5cbf02 Merge pull request #5210 from simnandez/3.9
FIX issues with entity in leave creation
2016-05-18 20:28:35 +02:00
Laurent Destailleur
24673d066f Merge pull request #5216 from atm-maxime/fix_dispatch_services_on_supplier_order
FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
2016-05-18 20:27:31 +02:00
Laurent Destailleur
28e9460a84 Merge pull request #5226 from joseplluis/patch-1
Fix bug: filter third parties without categories
2016-05-18 20:24:22 +02:00
Laurent Destailleur
ee73a91c77 Merge pull request #5218 from atm-florian/develop
Fix : Advanced Accountancy module
2016-05-18 20:22:07 +02:00
Josep Lluís
0ad21be132 Fix bug: filter third parties without categories
There is a bug on filter third parties without categories. No records found.
2016-05-18 19:27:57 +02:00
Laurent Destailleur
b1bd6b5d6e Fix regression 2016-05-18 18:23:38 +02:00
Regis Houssin
c7dda59fbc Fix: doublon (merge problem?) 2016-05-18 17:33:51 +02:00
Laurent Destailleur
cf8c180fa4 Fix perm and CRLF 2016-05-18 16:26:15 +02:00
Laurent Destailleur
f3cd4b3ee8 Fix doxygen 2016-05-18 14:43:56 +02:00
Laurent Destailleur
7e66a4cd1d Merge pull request #5221 from atm-florian/dev_fixwarning
FIX : php strict warning
2016-05-18 13:58:08 +02:00
Laurent Destailleur
43cb646779 Merge pull request #5219 from fmarcet/3.8
Fix: Expensereport not compatible with multicompany
2016-05-18 13:52:45 +02:00
Laurent Destailleur
a4b497ef81 Merge pull request #5212 from atm-alexis/3.8_fix_hook_called_but_not_initialized
FIX 3.8 hook on group card called but not initialized
2016-05-18 13:50:21 +02:00
Laurent Destailleur
bba3dc7dcd Make composer cleaner 2016-05-18 13:39:57 +02:00
Laurent Destailleur
9f20779136 Revert "Update escpos-php"
This reverts commit 2f42a226d0.
2016-05-18 13:18:55 +02:00
Laurent Destailleur
e7385c9e4f Try to solve side effect of this fuck... autoload creating a big mess in
a lot of features.
2016-05-18 11:57:13 +02:00
Laurent Destailleur
e6196f69cd Fix Restler bug returning warnings 2016-05-18 00:45:13 +02:00
Laurent Destailleur
cd75b43d58 Can enable modules during migration 2016-05-18 00:44:55 +02:00
Laurent Destailleur
acae888b3a Fix phpunits 2016-05-17 23:38:07 +02:00
Laurent Destailleur
c8a8474b69 Better practice in boolean comparison 2016-05-17 23:19:57 +02:00
Laurent Destailleur
753c5c7fc4 Fix minor error management 2016-05-17 23:14:30 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +02:00
Laurent Destailleur
a36b780c53 Fix phpunit 2016-05-17 20:30:04 +02:00
Laurent Destailleur
92e7177bcb Fix New into new 2016-05-17 19:58:29 +02:00
Laurent Destailleur
86076c2a01 Fix doxygen 2016-05-17 19:49:37 +02:00
Laurent Destailleur
7bbb3a7da1 Supplier proposal was missing 2016-05-17 19:34:23 +02:00
Laurent Destailleur
7063b26018 Debug 4.0 2016-05-17 19:32:19 +02:00
Laurent Destailleur
e2d3f4e27d Supplier proposal was missing 2016-05-17 19:15:44 +02:00
Laurent Destailleur
be251cd2b0 Add high risk sql at end 2016-05-17 18:22:48 +02:00
Laurent Destailleur
d083ad9382 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/resource/class/html.formresource.class.php
2016-05-17 18:21:22 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby
dates.
2016-05-17 18:19:36 +02:00
Laurent Destailleur
0e040b166d Fix: When we edit a product to use lot/serial number, we initialize
records for unknown lots to generic value 'Undefined'.
2016-05-17 17:55:41 +02:00
Laurent Destailleur
668df6cb7d Debug resource module 2016-05-17 10:51:13 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
63d0710842 FIX Creation of the second ressource type fails. 2016-05-17 10:44:30 +02:00
florian HENRY
cb1192aba5 check spelling 2016-05-17 09:03:27 +02:00
florian HENRY
4e98f57385 FIX : php strict warning 2016-05-17 09:02:22 +02:00
florian HENRY
67da7ab945 d 2016-05-17 08:50:54 +02:00
florian HENRY
91a436af81 resetExped 2016-05-17 08:46:28 +02:00