Commit Graph

30948 Commits

Author SHA1 Message Date
Laurent Destailleur
e35ff42eda Fix: [ bug #240 ] No description while adding a line in an Supplier
invoice
2011-12-01 22:25:11 +01:00
Laurent Destailleur
497ebdfdf2 Fix: Security audit purged 2011-11-30 20:20:16 +01:00
Laurent Destailleur
da2c033269 Fix: Can use paypal payment twice on same member. 2011-11-30 15:18:51 +01:00
Laurent Destailleur
dbb70fdd4e Fix: Navigation on shipment cards 2011-11-30 12:26:49 +01:00
Laurent Destailleur
f7ae87da3d Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-30 11:56:22 +01:00
Laurent Destailleur
8ef3a40800 Fix: Select of target on supplier category 2011-11-30 11:55:13 +01:00
Regis Houssin
e85bb79647 Merge pull request #56 from simnandez/3.1
Fix: [ bug #245 ] Content of note disappears
2011-11-30 00:43:55 -08:00
Juanjo Menent
8b2172b583 Fix: [ bug #245 ] Content of note disappears 2011-11-29 16:53:22 +01:00
Laurent Destailleur
92a79b8cd5 Fix: No default value on var by pointer 2011-11-26 18:32:14 +01:00
Laurent Destailleur
20123524c5 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-26 15:37:23 +01:00
Laurent Destailleur
1a84a0ccea Fix: Install not locked if PHP version too low 2011-11-26 15:35:53 +01:00
Laurent Destailleur
2ba7b72f8d Qual: Removed cvsignore files 2011-11-26 14:42:01 +01:00
Laurent Destailleur
f5c2992ec6 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-25 23:37:37 +01:00
Laurent Destailleur
6e5ba3d12d Fix: discount lost when creating invoice from order 2011-11-25 23:37:07 +01:00
Laurent Destailleur
03a6bdde76 Fix: Bad parameters 2011-11-25 18:49:59 +01:00
Laurent Destailleur
ffb2dfcd4d Fix: filter by categ 2011-11-25 02:02:21 +01:00
Regis Houssin
6046e6741c Merge pull request #55 from simnandez/3.1
Trad: Fix missing translations
2011-11-24 08:19:04 -08:00
Juanjo Menent
3c8a25e99f Trad: Fix missing translations 2011-11-24 17:16:29 +01:00
Laurent Destailleur
322135c09d Fix: Missing list of details of lines 2011-11-23 20:18:31 +01:00
Carlos Nogueira
3a175aab60 Update htdocs/langs/pt_PT/projects.lang 2011-11-23 09:12:36 +01:00
Laurent Destailleur
e4cb045b53 Fix: pgsql compatibility 2011-11-22 02:16:39 +01:00
Laurent Destailleur
27e6f9a277 Fix: duplicate assignement 2011-11-22 00:40:57 +01:00
Laurent Destailleur
7108fbda6f Add test to avoid bad input 2011-11-22 00:20:33 +01:00
Laurent Destailleur
7d3a2e4ad8 Fix: [ bug #236 ] Can't attach a file to e-mailings
(cherry picked from commit 311f013289)

Conflicts:

	htdocs/comm/mailing/fiche.php
	htdocs/lib/files.lib.php
2011-11-22 00:07:35 +01:00
Laurent Destailleur
be2e150026 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-21 13:20:10 +01:00
Regis Houssin
fb99609bd3 Merge branch '3.1' 2011-11-20 19:49:28 +01:00
Laurent Destailleur
26e66fa5fe Fix: duplication result problem 2011-11-20 18:54:54 +01:00
Laurent Destailleur
e08e07c493 Fix: [ bug #233 ] Delete invoice problem with a discount 2011-11-19 19:04:55 +01:00
Laurent Destailleur
a4570c578e Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-18 23:45:12 +01:00
Laurent Destailleur
6d78f7e641 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-18 13:11:24 +01:00
Laurent Destailleur
5699127b66 Fix: Correct sign 2011-11-18 13:08:20 +01:00
Laurent Destailleur
5492f4ff75 Fix: correct sign 2011-11-18 12:35:16 +01:00
Regis Houssin
39cc8fc0ff Merge pull request #51 from simnandez/3.1
Fix: [bug 235] Bad local tax control
2011-11-17 13:37:25 -08:00
Juanjo Menent
69f4fb8112 Fix: load file other.lang solve missing translations 2011-11-17 17:45:23 +01:00
Juanjo Menent
a35dcfeb07 Fix: [bug 235] Bad local tax control 2011-11-17 09:21:30 +01:00
Laurent Destailleur
eaba1c94f3 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-16 20:23:01 +01:00
Laurent Destailleur
2fe35d41a1 Fix: Deposits was not included into lines but into into remain to
pay(cherry picked from commit bf9c482f8a)

Conflicts:

	htdocs/compta/facture.php
	htdocs/compta/stats/cabyuser.php
	htdocs/compta/stats/casoc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/fr_FR/bills.lang
2011-11-16 20:21:28 +01:00
Juanjo Menent
5d85ea89ed Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1 2011-11-16 17:13:35 +01:00
Juanjo Menent
582d994e54 Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1 2011-11-14 18:14:17 +01:00
Laurent Destailleur
8fd5acc557 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-14 01:48:21 +01:00
Regis Houssin
42a687fe75 Merge branch '3.1' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-12 13:00:01 +01:00
Regis Houssin
a2e2c12e66 Fix: carriage return problem 2011-11-12 12:59:21 +01:00
Juanjo Menent
27ad7acc68 Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1 2011-11-11 09:45:53 +01:00
Laurent Destailleur
5fa04fd6ec Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-11 01:32:55 +01:00
Laurent Destailleur
04989ff4a0 Fix: double screen when creating product with no ref 2011-11-11 01:30:00 +01:00
Regis Houssin
a1a225e52d Fix: exclude install.lock files during purge
Conflicts:

	htdocs/admin/tools/purge.php
2011-11-10 16:51:43 +01:00
Juanjo Menent
659bf039c9 Trad: Fix missing translation 2011-11-10 23:08:39 +08:00
Juanjo Menent
d1940be71b Trad: Fix missing translation 2011-11-10 15:51:36 +01:00
Laurent Destailleur
1a3b3f557b Fix: Missing socid 2011-11-09 21:46:52 +01:00
Laurent Destailleur
d08d28c0cd Fix: Sanitize PHP_SELF 2011-11-09 13:40:29 +01:00