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

37051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
b4c5114ee6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04 Fix: syntax error 2013-06-03 19:25:12 +02:00
Laurent Destailleur
1ff175f14e Fix: Bad regex 2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c Fix: Loading of boxes from external modules 2013-06-03 12:43:14 +02:00
Laurent Destailleur
6cf1d25529 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2013-06-03 11:09:40 +02:00
Laurent Destailleur
4f0758f9b1 Merge pull request #1011 from marcosgdf/minor 
Avoid warnings
 2013-06-02 04:29:23 -07:00
Laurent Destailleur
25e8b39ca8 Merge pull request #1010 from marcosgdf/bug-908 
Fix: [bug #908] Erreur lors de la configuration du module
 2013-06-02 04:17:48 -07:00
Laurent Destailleur
c8c9ea797d Merge pull request #1009 from marcosgdf/bug-903 
Fixed bug #903: Fatal error: Call to undefined function dol_get_first_da...
 2013-06-02 04:17:07 -07:00
Laurent Destailleur
b75893b3de Merge pull request #1013 from marcosgdf/style 
Fixed empty table when few modules are activated in product card view
 2013-06-02 04:07:49 -07:00
Marcos García
c12da33dcd Fixed empty table when few modules are activated in product card view 2013-06-02 00:37:33 +02:00
Laurent Destailleur
c5783215c4 Fix: Var not initialized 
Fix: Pb of duplicate run of javascript with jmobile
 2013-06-01 23:46:36 +02:00
Marcos García
cf1d269f15 Avoid warnings 2013-06-01 16:11:45 +02:00
Marcos García
7b20757449 Fix: [bug #908] Erreur lors de la configuration du module 2013-06-01 15:51:17 +02:00
Marcos García
8ae0939ae5 Fixed bug #903: Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php 2013-06-01 15:39:45 +02:00
Laurent Destailleur
520101bdfb Fix: Missing vat rate 2013-06-01 02:52:25 +02:00
Laurent Destailleur
9b96e38a35 Fix: Update vat rates for canada 
Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-06-01 02:49:44 +02:00
Laurent Destailleur
0b3a52395d Fix: Missing mayotte 2013-06-01 02:21:39 +02:00
Laurent Destailleur
b3b80701fd Fix: Bug with jmobile 2013-06-01 02:03:19 +02:00
Laurent Destailleur
4b0b6fdd55 Fix: Avoid pb with jmobile 2013-06-01 00:24:13 +02:00
Raphaël Doursenaud
9f1eb0676b Fix install with PostgreSQL 
The language should be lowercase and unquoted
 2013-06-01 00:02:13 +02:00
Laurent Destailleur
743da5a214 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.

Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-05-31 21:33:48 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error 
Fix: Bad field param
 2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e Fix: Bad param used 2013-05-31 16:35:32 +02:00
Laurent Destailleur
5254f102ba Fix: Solve duplicate js and solve jmobile problem of cache. 2013-05-31 16:34:02 +02:00
Laurent Destailleur
67a6313487 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-31 08:02:53 +02:00
Laurent Destailleur
9c049e73af Fix: Support pages were not independants. 2013-05-30 23:53:12 +02:00
Laurent Destailleur
361e291d2d Fix: Lang not loaded 2013-05-30 19:36:00 +02:00
simnandez
5fa2598a6f Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 17:58:48 +02:00
Juanjo Menent
694eef9386 Merge pull request #1006 from marcosgdf/translations 
Reverting PR #1002
 2013-05-30 08:10:19 -07:00
Marcos García
f6057bd794 Reverting PR #1002 
Incorrect translation that shouldn't have been accepted
 2013-05-30 16:48:04 +02:00
Laurent Destailleur
e6bca3c549 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-29 22:42:48 +02:00
Laurent Destailleur
7413e33599 Fix: Bad page code 2013-05-29 22:41:57 +02:00
Laurent Destailleur
09d3b1c128 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-05-29 21:21:24 +02:00
Laurent Destailleur
d1d329a6a2 Fix: Navigation into supplier invoices 2013-05-29 21:20:04 +02:00
Laurent Destailleur
4fa99a86ed Fix: Bad permissions 2013-05-29 21:18:21 +02:00
simnandez
00395c87a8 Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:17:39 +02:00
Laurent Destailleur
7ecafc2e54 Merge pull request #1003 from FHenry/3.3 
add translation
 2013-05-29 08:26:12 -07:00
Juanjo Menent
e5aa78aa86 Merge pull request #1002 from FHenry/3.4 
Add translation from pcbelt@hotmail.com(Rodrigo Beltrán) get from
 2013-05-29 07:12:18 -07:00
Florian Henry
8b2dc49734 update trans 2013-05-29 16:06:04 +02:00
Florian Henry
eb6e6ecc71 update trans 2013-05-29 16:05:35 +02:00
Florian Henry
7ab46b8e7b add translation 2013-05-29 15:59:16 +02:00
Florian Henry
b563877f5a Add translation from pcbelt@hotmail.com(Rodrigo Beltrán) get from 
assodolibarr@gmail.com
 2013-05-29 15:56:32 +02:00
Laurent Destailleur
b2600e8880 Fix: Missing trans 2013-05-29 02:20:30 +02:00
Laurent Destailleur
2878d6f423 Fix version 2013-05-29 01:32:56 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d Fix: But siwtiching to auguria menu. 2013-05-29 01:24:57 +02:00
Laurent Destailleur
6d2db1c09f Merge pull request #977 from cbattarel/3.3 
[ bug #806 ] Tasks are ordered alphabetically instead of chronological order
 2013-05-28 15:14:02 -07:00
Laurent Destailleur
c4b12a6a83 Merge pull request #997 from FHenry/3.4 
3.4
 2013-05-28 14:42:05 -07:00
Florian Henry
8a726ab51b Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-28 21:51:11 +02:00