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

25948 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Laurent Destailleur
5027152194 Fix: We must not filter on html content but only on javascript content 
to avoid errors when using fckeditor
 2011-11-09 12:04:08 +01:00
Laurent Destailleur
966c82f96c Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-09 11:54:27 +01:00
Laurent Destailleur
24db4d0b0f Fix: Can edit accountancy code 2011-11-09 11:52:43 +01:00
Regis Houssin
762f98ab41 Fix: [Bug #232] Multiple Cross-Site-Scripting vulnerabilities 2011-11-08 17:17:21 +01:00
Laurent Destailleur
5a2b697c2e Fix: [ bug #228 ] Facture depuis commande remisée 2011-11-08 00:50:33 +01:00
Regis Houssin
9ff0690912 Fix: entity filter 2011-11-07 09:43:03 +01:00
Laurent Destailleur
5fd87f1290 Fix: Bad sql request 2011-11-06 14:22:52 +01:00
Laurent Destailleur
20bfe38a40 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-06 01:16:20 +01:00
Regis Houssin
79effca5fe Fix: old bad merge 2011-11-06 01:01:07 +01:00
Laurent Destailleur
0b20940d20 Fix: Localisation of prices 2011-11-06 00:40:30 +01:00
Laurent Destailleur
d376ba6e15 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-05 13:29:29 +01:00
Laurent Destailleur
29fd15405d Fix: new lines not correctly outputed 2011-11-05 13:21:49 +01:00
Regis Houssin
a1a1dc9045 Fix: add json_decode function for old PHP 2011-11-05 12:47:17 +01:00
Regis Houssin
42f61de5c6 Fix: best json_encode function for old PHP 
Fix: remove unused function php2js
 2011-11-05 11:52:10 +01:00
Laurent Destailleur
c2cbd88d9e Fix: Implement json_encode function for old PHP 2011-11-05 00:47:22 +01:00
Laurent Destailleur
05d113133a Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-04 00:47:21 +01:00
Regis Houssin
dab87cc4a8 Fix: chmod 644 2011-11-03 18:04:49 +01:00
Regis Houssin
76d8c27dd3 Fix: uniform code 
Fix: entity filter
 2011-11-03 17:48:28 +01:00
Laurent Destailleur
c89823bae6 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-03 02:04:50 +01:00
Laurent Destailleur
c539155d6a Security: More security holes fixed 2011-11-02 21:20:00 +01:00
Regis Houssin
9845761850 Merge pull request #43 from simnandez/3.1 
Fix: [bug 227] LocalTaxes: Suppliers calculate problem
 2011-11-02 12:34:16 -07:00
Laurent Destailleur
63820ab375 Security: A lot of security fixes 2011-11-02 20:17:23 +01:00
Laurent Destailleur
295745f62a Fix: Add missing entries 2011-11-02 19:15:08 +01:00
Laurent Destailleur
2c4618d2f6 Fix: Try a fix to allow trigger for changing password 2011-11-02 18:05:01 +01:00
Juanjo Menent
21e579ed22 Fix: [bug 227] LocalTaxes: Suppliers calculate problem 2011-11-02 16:59:24 +01:00
Laurent Destailleur
ab3abaa7a3 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-11-01 22:47:14 +01:00
Laurent Destailleur
96385247a3 Fix: translation 2011-11-01 16:03:59 +01:00
Laurent Destailleur
72ae4e1f5b Fix: LOG_ERR and not LOG_ERROR 2011-11-01 12:22:19 +01:00
Laurent Destailleur
c3d8341034 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-31 09:50:52 +01:00
Laurent Destailleur
58398cdba1 Fix: Bad URL 2011-10-31 09:48:17 +01:00
Laurent Destailleur
9e6aaf7021 Fix: Filter on third party 2011-10-29 00:00:35 +02:00
Laurent Destailleur
6fb587cc22 Fix: Order by title 2011-10-28 23:27:40 +02:00
Laurent Destailleur
58ad03117d Fix: pgsql compatibility 2011-10-28 00:33:28 +02:00
Laurent Destailleur
7b61c2c436 Fix: Substitution of free text 2011-10-27 10:07:28 +02:00
Laurent Destailleur
543460f14f Fix: Forget substitution in odt generation for invoices 2011-10-27 09:59:24 +02:00
Laurent Destailleur
f0e445a589 Fix: Wrong language object 2011-10-27 02:42:30 +02:00
Laurent Destailleur
aa76070ecb Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-26 12:59:56 +02:00
Laurent Destailleur
68005ff43a Fix: Removed unexpected exit 2011-10-26 12:54:14 +02:00
Regis Houssin
b2981d41df Merge branch '3.1' 2011-10-25 10:18:06 +02:00
Laurent Destailleur
7310c2f461 Fix: Better error management 2011-10-25 01:57:46 +02:00
Laurent Destailleur
fed9dd6361 Add transaction for interventions 2011-10-24 14:48:15 +02:00
Regis Houssin
a8fee6d9be Merge branch '3.1' 2011-10-24 13:28:08 +02:00
Laurent Destailleur
118bcbfcc2 Fix: Error when creating a group using posix class 2011-10-23 20:15:52 +02:00
Laurent Destailleur
d2208d4266 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-23 20:06:19 +02:00
Regis Houssin
b7b6ff6ca7 Added temporarily before to find another solution 2011-10-23 18:38:58 +02:00
Regis Houssin
a794ed23af Fix: remove obsolete code 
use objectlinked for retrieve origin and origin_id of an object
 2011-10-21 11:10:27 +02:00
Laurent Destailleur
5e58a97c93 Fix: Enhance dump success detection 2011-10-20 00:06:38 +02:00
Juanjo Menent
e3cba678e5 Fix: [bug 213] CashDesk: Products don't are added to basket 2011-10-19 11:04:30 +02:00
eldy
db406df3d3 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-19 02:55:22 +02:00
eldy
93f057ba6b Minor fix: Field autoselected on correct country. 2011-10-19 02:54:22 +02:00
Laurent Destailleur
58a4d397e6 [ bug #85 ] Facture sur modèle ODT 2011-10-18 03:23:28 +02:00
Laurent Destailleur
39df11d2ba Fix: Error management 2011-10-17 21:04:35 +02:00
Laurent Destailleur
0bfbffbe5f Fix: bug #34545 : Sauts de lignes en vue de produit libre - New lines in 
free product line view
 2011-10-17 14:48:56 +02:00
Laurent Destailleur
76dc867e24 Fix: Typo 2011-10-17 14:13:18 +02:00
Laurent Destailleur
3f46202fa0 Fix: Bad sql syntax 2011-10-15 01:11:11 +02:00
Laurent Destailleur
8bd2d6f572 Fix: Typo 2011-10-15 00:46:52 +02:00
Laurent Destailleur
6ca30be694 Fix: Keep value 2011-10-14 13:31:37 +02:00
Laurent Destailleur
d1c5ec9bdd Update Url 2011-10-14 00:08:35 +02:00
Laurent Destailleur
6f8e554430 Update tr_TR language 2011-10-13 16:48:17 +02:00
eldy
7ade93c1e8 Revert "Revert "Trans"" 
This reverts commit 8f56073713.
 2011-10-12 02:38:22 +02:00
eldy
8f56073713 Revert "Trans" 
This reverts commit 4ad1ce3f5f.
 2011-10-12 01:29:07 +02:00
eldy
4ad1ce3f5f Trans 2011-10-12 01:02:16 +02:00
eldy
63d61b3842 Fix: Everyone can access point of sale 2011-10-10 20:01:41 +02:00
Juanjo Menent
1a85d0804d Trad: Add translation for dictionaries admin page 2011-10-10 17:40:08 +02:00
Juanjo Menent
64df40d324 Fix: (Bug 13) CashDesk: Everyone can access to the Point of sales 2011-10-10 17:22:42 +02:00
eldy
7fe76249e0 Trans: Update nl_NL language 2011-10-10 02:44:19 +02:00
eldy
524b3dcb14 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-10 00:05:52 +02:00
eldy
c517ae071d Fix: Hide supplier info if permission to read suppliers not on 2011-10-10 00:03:47 +02:00
Cedric Ziel
3ca602c3fd * Fixed typo 2011-10-09 22:46:18 +02:00
eldy
baf56fbd51 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-09 17:38:25 +02:00
eldy
351807ee9a Fix: TVA Non Perçue Récupérable 2011-10-09 17:37:47 +02:00
eldy
dab1317649 Merge branch '3.1' of https://eldy@github.com/Dolibarr/dolibarr.git into 3.1 2011-10-07 01:42:22 +02:00
eldy
c902265c2e Fix: update italy vat rate 2011-10-07 01:40:06 +02:00
eldy
b1ea85c504 Fix: Lines of invoice are correctly encoded 2011-10-03 18:57:45 +02:00
eldy
3187d283e5 Fix: Removed deprecated file 2011-09-27 02:30:01 +02:00
eldy
af5e049a89 Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1 2011-09-26 16:37:38 +02:00
eldy
22ba312e5d Fix: Security fix 2011-09-26 16:36:51 +02:00
Regis Houssin
20052a1fd3 Fix: remove unstable module 2011-09-26 12:23:44 +02:00