Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,581 Commits 36 Branches 190 Tags
b59b7785eecb51e50bcf3cf30e224e9435de80f9
Commit Graph

41843 Commits

Author SHA1 Message Date
Laurent Destailleur
b59b7785ee Fix error management 2015-07-19 16:00:12 +02:00
Laurent Destailleur
fdbfc7facd Fix missing language load 2015-07-19 15:48:35 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
4f5e8e2480 Fix: missing context before calling trigger. 
Clean demo file with list of triggers.
 2015-07-19 15:24:54 +02:00
Laurent Destailleur
0402a1661c Fix: Sending email must be done after payment ok is shown and trigger 
has been ran.
 2015-07-19 14:40:18 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Laurent Destailleur
2e2f99c351 Merge branch 'bug-3180' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3180

Conflicts:
	ChangeLog
 2015-07-19 11:28:48 +02:00
Laurent Destailleur
4100026c71 Merge branch 'bug-3268' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3268

Conflicts:
	ChangeLog
 2015-07-19 11:27:28 +02:00
Laurent Destailleur
8d7c1f8d4c Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid 2015-07-19 11:21:21 +02:00
Marcos García de La Fuente
3d6c5b09e8 Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter 
Close #3268
 2015-07-19 11:19:47 +02:00
Marcos García de La Fuente
538c8c072b Merge branch '3.5' into bug-3180 
Conflicts:
	ChangeLog
 2015-07-19 11:16:36 +02:00
Laurent Destailleur
a5ffcb50ae Update admin.lang 
More complete description of module poll.
 2015-07-19 00:32:57 +02:00
Laurent Destailleur
eec1f4dcdf Merge pull request #3267 from Dolibarr/3.8 
fix user role and uk_user_api_key if api module not enabled
 2015-07-18 23:51:51 +02:00
Marcos García de La Fuente
b28c4df0d6 Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result 
Close #3180
 2015-07-18 17:35:36 +02:00
Marcos García de La Fuente
7185cfeb84 Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names 2015-07-18 14:48:59 +02:00
Marcos García de La Fuente
e9d1e6265d Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics 
Close #2696
 2015-07-18 14:25:05 +02:00
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
Juanjo Menent
57f5c95894 Merge pull request #3261 from atm-gauthier/3.7_fix_trad_availability 
FIX : load propal langs for availability traduction
 2015-07-17 19:20:56 +02:00
Juanjo Menent
b7c18c9bef Merge pull request #3257 from aspangaro/3.8-patch10 
Fix: #3229 [Members] Cancelling member type creation yields weird bug
 2015-07-17 19:18:12 +02:00
Juanjo Menent
16b75fda31 Merge pull request #3256 from aspangaro/3.8-patch9 
Fix: #3242 [Dashboard] Checks waiting for deposit bad main menu
 2015-07-17 19:17:34 +02:00
Juanjo Menent
a5b5302806 Merge pull request #3255 from aspangaro/3.8-patch8 
Fix: #3253 #3252 #3251 Remove print_r
 2015-07-17 19:17:04 +02:00
Juanjo Menent
06684ea362 Merge pull request #3250 from aspangaro/3.8-patch7 
Fix: #3228 [Export] Missing member ID field in users
 2015-07-17 19:15:53 +02:00
Juanjo Menent
0971e88531 Merge pull request #3249 from aspangaro/3.8-patch6 
Fix: #3230 [Leaves] Module setup page is useless
 2015-07-17 19:15:31 +02:00
Juanjo Menent
9c6573edd4 Merge pull request #3248 from aspangaro/3.8-patch5 
Fix: #3232 [Agenda] Setup page tab order is weird
 2015-07-17 19:14:34 +02:00
Juanjo Menent
efde88d211 Merge pull request #3247 from aspangaro/3.8-patch4 
Fix: [Homepage] colspan problem with tasks box
 2015-07-17 19:13:44 +02:00
Juanjo Menent
59b8ae9c5e Merge pull request #3246 from aspangaro/3.8-patch3 
Fix: #3244 [Homepage] Last n members link broken
 2015-07-17 19:12:29 +02:00
Raphaël Doursenaud
953a21b55e FIX #3262 Webservice getProductsForCategory() 
Wrong variable name was used!
 2015-07-17 18:02:44 +02:00
Gauthier
244d1839e4 FIX : load propal langs for availability traduction 2015-07-17 17:24:11 +02:00
aspangaro
fb0f50cf4b Fix: #3229 [Members] Cancelling member type creation yields weird bug 2015-07-17 06:11:06 +02:00
aspangaro
e8d99323d4 Fix: #3242 [Dashboard] Checks waiting for deposit bad main menu 2015-07-17 05:39:08 +02:00
aspangaro
7b1976040d Error 2015-07-17 05:26:32 +02:00
aspangaro
5ce419922d Fix: #3253 #3252 #3251 Remove print_r 2015-07-17 05:22:29 +02:00
aspangaro
a0d74cc1a1 Fix: #3228 [Export] Missing member ID field in users 2015-07-16 22:50:50 +02:00
aspangaro
440e144892 Fix: #3230 [Leaves] Module setup page is useless 2015-07-16 22:29:04 +02:00
aspangaro
2d3d78ecc0 Fix: #3232 [Agenda] Setup page tab order is weird 2015-07-16 22:16:11 +02:00
aspangaro
f970494d1e Fix: [Homepage] colspan problem with tasks box 2015-07-16 21:29:15 +02:00
aspangaro
3b547c0979 Fix: #3244 [Homepage] Last n members link broken 2015-07-16 21:17:31 +02:00
aspangaro
23673cf464 Fix: ER vat rate don't show in pdf 2015-07-16 20:51:22 +02:00
Laurent Destailleur
e6aca8e4d3 Traduction manquante 2015-07-16 13:51:23 +02:00
Laurent Destailleur
9e39c73f5f Better translation 2015-07-16 13:28:40 +02:00
aspangaro
d9dd9ff688 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-16 12:25:37 +02:00
Laurent Destailleur
1d0a8ceca9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-16 10:59:42 +02:00
Laurent Destailleur
e992a959cd Fix dbt_select 2015-07-16 10:59:00 +02:00
Laurent Destailleur
1a61ab055f Merge pull request #3207 from atm-ph/fix_37_translation_category 
FIX : translation for 1 word do not work
 2015-07-16 10:26:00 +02:00
Laurent Destailleur
e62595b00f Merge pull request #3204 from hregis/3.8_story2 
Fix: wrong translation
 2015-07-16 10:25:41 +02:00
Laurent Destailleur
085ecba1a3 Merge pull request #3203 from hregis/3.8_story 
Fix: for avoid mysql error with canvas
 2015-07-16 10:25:19 +02:00
Laurent Destailleur
670842429c Merge pull request #3202 from hregis/3.8_minor 
Fix missing mode
 2015-07-16 10:24:37 +02:00
Laurent Destailleur
1d83a2ea33 Merge pull request #3201 from hregis/3.8_layout 
Fix: for avoid jquery error in ECM module
 2015-07-16 10:23:02 +02:00