lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,181 Commits 43 Branches 150 Tags 886 MiB
630a063283
Commit Graph

50181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
630a063283 FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries

Conflicts:
	htdocs/compta/facture.php
 2016-06-15 18:24:15 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:12:34 +02:00
Laurent Destailleur
d9553212ac Merge pull request #5302 from atm-maxime/fix_sanitizefilename 
FIX #5153
 2016-06-05 00:08:30 +02:00
Maxime Kohlhaas
7866fb9dae Fix #5153 2016-06-04 19:11:32 +02:00
Laurent Destailleur
a4411c7fe7 Merge pull request #5299 from atm-maxime/fix_expensereport_rights 
Fix rights check on expense reports
 2016-06-04 18:40:45 +02:00
Maxime Kohlhaas
abe84ef991 Fix rights check on expense reports 2016-06-04 18:32:00 +02:00
Laurent Destailleur
acc8cca84a Merge pull request #5290 from atm-ph/fix_3.7_issue_2777 
Fix #2777
 2016-06-04 18:07:16 +02:00
Laurent Destailleur
aebc7b1233 Merge pull request #5285 from atm-maxime/fix_menus_dashboard_links 
FIX #3243
 2016-06-04 17:33:25 +02:00
phf
a62f5bd5b4 Fix #2777 2016-06-04 17:17:22 +02:00
Laurent Destailleur
1552e7f41f Merge pull request #5286 from atm-ph/fix_3.7_call_function_not_exists 
Fix call function ldap_connect but not exists
 2016-06-04 14:56:42 +02:00
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
c9834117c9 Fix #5156 2016-06-04 02:03:30 +02:00
Laurent Destailleur
ff6daebee6 FIX #5203 2016-06-04 01:19:27 +02:00
Laurent Destailleur
b47db3e9e1 Merge pull request #5266 from atm-maxime/fix_project_time_spent_access 
Fix access to project task time spent creation #5249
 2016-06-04 00:13:32 +02:00
Laurent Destailleur
b9feae0883 Merge pull request #5270 from atm-maxime/fix_pmp_when_stock_enabled 
Fix pmp when stock enabled
 2016-06-04 00:12:53 +02:00
Maxime Kohlhaas
8b0b3b1a9d PMP available only if stock module enabled 2016-06-03 23:49:34 +02:00
Laurent Destailleur
d20d88e1af Merge pull request #5265 from atm-ph/fix_3.8_soc.php_with_wrong_id 
Fix #4632
 2016-06-03 23:43:54 +02:00
Maxime Kohlhaas
c9c7045a6f Fix access to project task time spent creation #5249 2016-06-03 23:34:37 +02:00
phf
778b05c341 Fix #4632 2016-06-03 23:06:53 +02:00
Juanjo Menent
fde6909530 Merge pull request #5258 from atm-maxime/3.8 
Fix SQL error on order stats
 2016-06-03 16:19:56 +02:00
Maxime Kohlhaas
ab44adc6d5 Fix SQL error on order stats 2016-06-02 12:37:37 +02:00
Laurent Destailleur
c2d8bd99dc Merge pull request #5244 from atm-gauthier/3.8_fix_mergepropal 
FIX : same page added several times on mergepropal option
 2016-05-29 12:03:35 +02:00
Laurent Destailleur
3f49f0df33 Merge pull request #5245 from atm-gauthier/3.8_fix_sql_error_on_facture_create 
FIX : SQL error function on getAvailableDiscounts function, on bill c…
 2016-05-29 11:58:28 +02:00
gauthier
71ee941cf8 FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty 2016-05-25 12:25:39 +02:00
gauthier
1ce91bac06 FIX : same page added several times on mergepropal option 2016-05-25 11:25:19 +02:00
Laurent Destailleur
24d7c6aae7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-23 12:27:15 +02:00
Laurent Destailleur
e2e95641a3 FIX Search supplier ref on contract 2016-05-23 12:27:02 +02:00
Laurent Destailleur
ebf31d87ea Merge pull request #5234 from frederic34/patch-7 
Fix next month or next year in opensurvey
 2016-05-22 14:23:30 +02:00
Frédéric FRANCE
9e5db0f3c6 Fix next month or next year in opensurvey 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55209-bug-calendrier-opensurvey-v3-9
 2016-05-21 09:18:16 +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
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
517b189df2 Merge pull request #5225 from hregis/3.8_bug 
Fix: doublon (merge problem?)
 2016-05-18 17:39:14 +02:00
Regis Houssin
c7dda59fbc Fix: doublon (merge problem?) 2016-05-18 17:33:51 +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
94c532dd8a Clean splitted lines into llx_product_batch 2016-05-16 23:58:06 +02:00
Laurent Destailleur
929787006e Clean data 2016-05-16 22:40:29 +02:00
Your Name
f7c9f20b16 Fix: Expensereport not compatible with multicompany. 2016-05-16 17:21:32 +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
b3b064d310 FIX hook on group card called but not initialized 2016-05-14 18:58:14 +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
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
82ea686bc0 Merge pull request #5182 from atm-maxime/fix_contract_line_creation 
Fix contract line creation
 2016-05-13 20:26:41 +02:00
Florian HENRY
4cbab1cf47 FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH 2016-05-12 16:58:14 +02:00
Florian HENRY
d3b3e60d82 Fix email template edition 2016-05-10 22:37:30 +02:00
phf
a57e0f5fd3 Fix update supplier ref on supplier invoice 2016-05-10 14:27:24 +02:00
Florian HENRY
1c0bdfcf1e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-10 14:15:22 +02:00