Commit Graph

31373 Commits

Author SHA1 Message Date
Laurent Destailleur
8eedf3db96 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-19 09:11:09 +02:00
Laurent Destailleur
d5a4f73501 Add fill/reset 2013-04-19 09:10:56 +02:00
Laurent Destailleur
6860aa05c7 Fix: Missing test 2013-04-19 00:20:21 +02:00
Laurent Destailleur
ac8868e2d2 Fix: Use correct format for js 2013-04-18 19:56:14 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
Regis Houssin
301ae58cdd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-18 11:16:09 +02:00
Regis Houssin
ebb09db710 Fix: for avoid errors 2013-04-18 11:05:31 +02:00
Juanjo Menent
e58e326c9c Merge pull request #842 from atm-maxime/develop
2 minor fixes
2013-04-18 01:20:40 -07:00
Maxime Kohlhaas
6c62d0cd28 Print forgotten 2013-04-18 10:12:16 +02:00
Regis Houssin
b6bcffa4d9 Fix: missing field 2013-04-18 09:44:33 +02:00
Regis Houssin
2538a9e20e Fix: duplicate sql request 2013-04-18 09:39:43 +02:00
Maxime Kohlhaas
dcdbdd42fb Fix : action list couldn't be sorted by label, action type was kept in filter 2013-04-18 09:25:19 +02:00
Maxime Kohlhaas
1381373c95 Fix : set emetteur to MYCOMPANY when payment is a customer 2013-04-18 09:24:29 +02:00
Laurent Destailleur
31ce3d67a3 Merge remote-tracking branch 'origin/3.3' into develop 2013-04-17 23:18:15 +02:00
Laurent Destailleur
52a0df3424 Fix: Bad translation 2013-04-17 20:13:42 +02:00
simnandez
c9074231b5 Fix: Spelling es_ES boxes lang
Trad: Add ca_ES missing translations
2013-04-17 17:06:19 +02:00
Juanjo Menent
fa4490ef79 Merge pull request #840 from FHenry/develop
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 07:59:34 -07:00
Laurent Destailleur
f9541590c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-17 16:26:33 +02:00
Laurent Destailleur
bcacbab481 Qual: No need to use two menu entries for this. 2013-04-17 16:26:14 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Laurent Destailleur
21a1441a80 Merge pull request #839 from FHenry/3.3
Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
2013-04-17 02:58:32 -07:00
Laurent Destailleur
41ed4b57c4 Merge pull request #838 from FHenry/develop
Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
2013-04-17 02:58:16 -07:00
Regis Houssin
5c50b1db57 Fix: use empty instead isset 2013-04-17 10:42:44 +02:00
Regis Houssin
4c13a4049c Fix: use empty instead isset 2013-04-17 10:41:54 +02:00
fhenry
1b044fd9d6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-16 20:07:42 +02:00
Laurent Destailleur
d28316f4a8 Look: Optimize size 2013-04-16 16:33:05 +02:00
Laurent Destailleur
b30c492494 Fix: pgsql upgrade 2013-04-16 16:29:21 +02:00
fhenry
7e3ca0ce16 Fix bug
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug#22548
2013-04-16 16:02:13 +02:00
fhenry
e2156b5df7 Fix bug
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug
2013-04-16 16:00:23 +02:00
Laurent Destailleur
a5deb8e9d7 Fix: bug into is_erasable function.
Conflicts:
	test/phpunit/NumberingModulesTest.php
2013-04-16 15:54:36 +02:00
Laurent Destailleur
4fe49b6736 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196 Fix: bug into is_erasable function. 2013-04-16 15:00:41 +02:00
fhenry
cba73b238c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/comm/propal.php

Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
2013-04-16 11:37:51 +02:00
Laurent Destailleur
9659ecba70 Merge pull request #836 from jfefe/extrafields
Fix on extrafields date type : do not show current date when field not r...
2013-04-16 02:33:01 -07:00
fhenry
eb0d2cc5d8 Fix [ bug #789 ] VAT not being calculated in POS 2013-04-16 08:56:45 +02:00
Juanjo Menent
1602fcf7bc Merge pull request #837 from FHenry/3.3
Fix [ bug #789 ] VAT not being calculated in POS
2013-04-15 23:54:03 -07:00
Laurent Destailleur
d3f29649d5 Fix into div/br 2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
4fab5fbeeb Fix: bad language file 2013-04-15 23:11:48 +02:00
fhenry
7d6c89169c Fix [ bug #789 ] VAT not being calculated in POS 2013-04-15 23:06:03 +02:00
Laurent Destailleur
3887b904ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-15 22:26:33 +02:00
Laurent Destailleur
51fe0d9e09 Removed duplicate function 2013-04-15 22:26:03 +02:00
Regis Houssin
7177e59ea4 Fix: missing quote 2013-04-15 21:41:34 +02:00
Regis Houssin
5682e0ae25 Fix: missing quote 2013-04-15 21:40:49 +02:00
Regis Houssin
c9dba00f3f Fix: missing current entity record 2013-04-15 21:29:49 +02:00
Regis Houssin
21056d2b78 Fix: missing current entity record 2013-04-15 21:27:01 +02:00
jfefe
610fed6b3c Fix on extrafields date type : do not show current date when field not required 2013-04-15 18:42:00 +02:00
Laurent Destailleur
b7edb3f472 Fix: Correct css 2013-04-15 18:04:22 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files.
Qual: Removed not used library.
Look: Uniformize css.
2013-04-15 18:00:20 +02:00
simnandez
76132206bf Fix: Bad link to all proposals into Third party card if customer is
prospect
2013-04-15 17:12:31 +02:00