Commit Graph

37867 Commits

Author SHA1 Message Date
Laurent Destailleur
3601cd13dd Merge pull request #1004 from viniciusvgn/develop
Translation pt-BR
2013-05-30 13:42:19 -07:00
Laurent Destailleur
0a4ca5a0b8 Merge pull request #1005 from GPCsolutions/pgsql
Fix install with PostgreSQL
2013-05-30 13:42:11 -07:00
Laurent Destailleur
361e291d2d Fix: Lang not loaded 2013-05-30 19:36:00 +02:00
Laurent Destailleur
d3bcaa72bc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-30 19:33:45 +02:00
Laurent Destailleur
5fd09b68db Fix: Support pages were not independants. 2013-05-30 19:29:08 +02:00
simnandez
7fa0d6cffa Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 18:00:08 +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
Raphaël Doursenaud
53fdc3b514 Fix install with PostgreSQL
The language should be lowercase and unquoted
2013-05-30 16:31:27 +02:00
Vinicius Nogueira
d163c95e02 Translation pt-BR
Updated file with phrases that were missing and improvements in the
translation.
2013-05-29 22:35:41 -03: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
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +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
Laurent Destailleur
b36a10babf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-29 21:05:48 +02:00
simnandez
4f9b5883df 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:18:24 +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
70e77269f6 Merge pull request #1001 from lrq3000/develop
Add Invoice hook in orderstoinvoice.php + Standardization
2013-05-29 08:33:15 -07: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
3fc8de8dde Fix: Navigation into supplier invoices 2013-05-29 15:56:18 +02:00
Laurent Destailleur
e6c93424ce Qual: Normalized tabs 2013-05-29 15:41:59 +02:00
Laurent Destailleur
60498f2692 Fix: Bad permissions 2013-05-29 13:31:57 +02:00
Stephen L
3b9af82c39 Add Invoice hook in orderstoinvoice.php + Standardization
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2013-05-29 13:28:44 +02:00
Laurent Destailleur
3cba6e71cc Fix: bad name file 2013-05-29 11:42:24 +02:00
Laurent Destailleur
832bd0a89e Merge pull request #1000 from viniciusvgn/develop
Translation pt-BR
2013-05-29 00:23:38 -07:00
Vinicius Nogueira
15e663ae15 Translation pt-BR
Updating translation files pt-BR
2013-05-28 23:07:08 -03: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
9ab8f4c6a3 Merge pull request #998 from FHenry/develop
Develop
2013-05-28 15:23:29 -07: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
b87350e2d6 Merge pull request #994 from defrance69/patch-13
Update modSociete.class.php
2013-05-28 15:09:45 -07:00
Laurent Destailleur
44ac4ade0e Merge pull request #991 from defrance69/patch-10
Update contrat.class.php
2013-05-28 15:00:21 -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
Florian Henry
7c56da05b8 Add hook on propal/order/incoive list 2013-05-28 18:35:15 +02:00
Laurent Destailleur
09caa526ea Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-28 18:28:01 +02:00
Florian Henry
23c25066d3 Change comment on dol_include_once 2013-05-28 17:54:55 +02:00
Florian Henry
3ddb410e2e Change comment on dol_include_once method 2013-05-28 17:53:56 +02:00
BENKE Charles
aa06a0b113 Update modSociete.class.php
enhance filter on export of contact
add postorfunction field in export of contact
2013-05-28 15:37:08 +02:00
simnandez
0219242484 Fix: Trad categories more accurate 2013-05-28 15:20:14 +02:00