Commit Graph

54672 Commits

Author SHA1 Message Date
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
BENKE Charlie
0944463805 Add : rappro order list 2016-05-14 10:06:35 +02:00
Juanjo Menent
21b639ef16 Fix issues with entity control 2016-05-14 00:47:46 +02:00
Laurent Destailleur
cba0ef5693 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-05-14 00:44:38 +02:00
Laurent Destailleur
af38d03825 Clean copyright and libs 2016-05-13 23:22:39 +02:00
Laurent Destailleur
d980742b6c Merge pull request #5057 from nka11/restler3.0.0RC6
Update Restler to 3.0.0RC6
2016-05-13 23:15:16 +02:00
Laurent Destailleur
2b225c76d7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-13 23:13:16 +02:00
Laurent Destailleur
1bba8166f8 FIX #5207 2016-05-13 23:12:53 +02:00
Laurent Destailleur
ae16e6cdca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-13 20:39:44 +02:00
Laurent Destailleur
6a0f16e9aa FIX #5189 2016-05-13 20:39:31 +02:00
Laurent Destailleur
ab27815f21 Merge pull request #5194 from IonAgorria/dolresource-element
Fix: Dolresource element type
2016-05-13 20:32:49 +02:00
Laurent Destailleur
7c26f328bb Merge pull request #5190 from atm-ph/fix_3.8_update_ref_fourn_on_supplier_invoice
Fix update supplier ref on supplier invoice
2016-05-13 20:29:09 +02:00
Laurent Destailleur
a5e3503598 Merge pull request #5187 from atm-gauthier/3.8_fix_param_fetch_company
FIX : can't fetch by siret or siren because of first "if"
2016-05-13 20:28:46 +02:00
Laurent Destailleur
620c8199e5 Merge pull request #5183 from frederic34/patch-7
Correction for Auguria Menu Accounting Expert
2016-05-13 20:28:05 +02:00
Laurent Destailleur
82ea686bc0 Merge pull request #5182 from atm-maxime/fix_contract_line_creation
Fix contract line creation
2016-05-13 20:26:41 +02:00
Laurent Destailleur
e885fe9f62 Merge pull request #5175 from grandoc/develop
add column numbering name and fix a lot of issues within members list
2016-05-13 20:22:47 +02:00
Laurent Destailleur
d1d1b824b4 Better coding of #5181. I removed need of external lib. 2016-05-13 20:20:48 +02:00
Laurent Destailleur
8aebc37a5f FIX Error message 2016-05-13 19:55:49 +02:00
philippe grand
45bdcd282a add mobile search within member list 2016-05-13 19:24:55 +02:00
Laurent Destailleur
2308d28c19 FIX Add test code to detect/test autoload conflict 2016-05-13 19:23:56 +02:00
philippe grand
23cae18765 add phone perso search within member list 2016-05-13 19:06:28 +02:00
philippe grand
740b6819c7 add phone pro search within member list 2016-05-13 17:49:16 +02:00
philippe grand
cd801fe1dd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-13 14:51:07 +02:00