lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,610 Commits 43 Branches 150 Tags 886 MiB
d3f283a8d9
Commit Graph

41868 Commits

Author SHA1 Message Date
All-3kcis
d3f283a8d9 Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS" 2015-07-21 11:43:23 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
84be353e13 Comments 2015-07-21 00:13:13 +02:00
Laurent Destailleur
2bebb869fb Fix bad signature of fetch. The ref_ext is missing. 2015-07-20 17:19:44 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Laurent Destailleur
d843b1fbe4 Fix: No html form tag inside a table tag. Must be out of table. 2015-07-20 13:03:12 +02:00
Laurent Destailleur
f0ed7dac09 Exclude tested module 2015-07-20 12:21:15 +02:00
Laurent Destailleur
2df2e8b44e Merge remote-tracking branch 'origin/3.8' into develop 2015-07-20 00:55:30 +02:00
Laurent Destailleur
c84b55e1af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-20 00:55:03 +02:00
Laurent Destailleur
85f344a23e Fix bad link 
Fix missing css
 2015-07-19 23:39:07 +02:00
elarifr
80c8c30ba7 generate fake api_key to store if api module not enabled 
correct user role select if api module not enabled
 2015-07-19 22:43:06 +02:00
Laurent Destailleur
22ff1d7a71 Fix no space into translation key 2015-07-19 21:47:40 +02:00
Laurent Destailleur
c0146c2ce3 Fix missing translation key 2015-07-19 20:23:58 +02:00
Laurent Destailleur
705245d70d Revert "NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 #3258" 2015-07-19 18:07:26 +02:00
Laurent Destailleur
c05900aece Merge pull request #3212 from FHenry/3.8 
NEW : upgrade jQuery Component Datable (and extras) to 1.10.7  #3258
 2015-07-19 16:02:59 +02:00
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
dafe0a37cf Merge branch 'bug-1925' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1925

Conflicts:
	ChangeLog
 2015-07-19 15:31:02 +02:00
Laurent Destailleur
ad5612158a Fix report of all error messages 2015-07-19 15:29:18 +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
Marcos García de La Fuente
b64adcc065 FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly 
Patch submitted by Philippe (pheno) at https://doliforge.org/tracker/?func=detail&aid=1925&group_id=144
 2015-07-19 15:13:27 +02:00
Marcos García de La Fuente
f2313748c8 Merge branch '3.7' into bug-1634 2015-07-19 14:57:39 +02:00
Marcos García de La Fuente
1be33e1dda FIX [ bug 1634 ] Error deleting a project when it had many linked objects 
Projet::delete was throwing DB error messages directly to the user instead of logging them and showing a proper error message to the user
 2015-07-19 14:56:52 +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