Commit Graph

54951 Commits

Author SHA1 Message Date
Laurent Destailleur
08549304f1 Enhance travis to have phpunit test on modules not available on old
version by enabling them at end of migration.
2016-05-18 00:51:15 +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
47f003c3fa Restore phpunit tests 2016-05-17 19:40:58 +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
Your Name
c30a3a5f7e Expense report grouped by user 2016-05-17 10:02:36 +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
florian HENRY
a45680dc19 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-05-17 08:37:22 +02:00
Laurent Destailleur
f9ded46a99 Start debug 4.0 2016-05-17 02:41:06 +02:00
Laurent Destailleur
901c7c9517 Link "Backtolist" was missing on products 2016-05-17 02:16:28 +02:00
Laurent Destailleur
05cbfbb38f Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/install/mysql/migration/repair.sql
2016-05-17 01:19:49 +02:00
Laurent Destailleur
1973f67d41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-17 01:11:14 +02:00
Laurent Destailleur
3a28935da3 Merge remote-tracking branch 'origin/3.9' into develop 2016-05-17 01:10:22 +02:00
Laurent Destailleur
95ea20eb44 Clean code for stock movement when lot are used. We should not get
duplicate records into llx_product_batch
2016-05-17 01:10:11 +02:00
Laurent Destailleur
75b4c61fbc Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/contrat/card.php
2016-05-17 00:02:54 +02:00
Laurent Destailleur
94c532dd8a Clean splitted lines into llx_product_batch 2016-05-16 23:58:06 +02:00
Laurent Destailleur
20a2e9394d Fix typo comment 2016-05-16 22:44:11 +02:00
Laurent Destailleur
929787006e Clean data 2016-05-16 22:40:29 +02:00
Laurent Destailleur
ad92b53d00 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-05-16 19:34:48 +02:00
Laurent Destailleur
4a3083a4c1 FIX Remove PHP Warning: Creating default object from empty value. 2016-05-16 19:34:24 +02:00
Your Name
e1fa86914e The approved status is enough to expense appear in the report 2016-05-16 18:41:41 +02:00
Your Name
f7c9f20b16 Fix: Expensereport not compatible with multicompany. 2016-05-16 17:21:32 +02:00
florian HENRY
5d4db68b87 fix travis 2016-05-16 17:07:36 +02:00
florian HENRY
f8ac6c96e0 fix accountancy export 2016-05-16 17:05:34 +02:00
florian HENRY
b8d452596c Fix : Advanced Accountancy module 2016-05-16 16:37:07 +02:00
Maxime Kohlhaas
af8608ab7a Fix services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES 2016-05-16 10:49:43 +02:00
Alexis Algoud
8d0e5479a0 Rename var 2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Alexis Algoud
b3b064d310 FIX hook on group card called but not initialized 2016-05-14 18:58:14 +02:00
BENKE Charlie
a1ce4000e1 NEW : Add list of billed
Very usefull when we have many rappro
Maybe do the same on other paiement
2016-05-14 10:14:10 +02:00