Commit Graph

32975 Commits

Author SHA1 Message Date
Laurent Destailleur
745b35f94e Missing translation key 2012-08-28 22:39:22 +02:00
Laurent Destailleur
6853ed0e5e Fix: permission for a user to view its own card using webservice 2012-08-28 22:31:51 +02:00
Laurent Destailleur
bd05056616 Fix: Missing br removed from select_produits 2012-08-28 22:25:58 +02:00
Laurent Destailleur
32ca894952 Try a fix for js syntax error 2012-08-28 22:05:40 +02:00
Laurent Destailleur
4108e48d5c Merge pull request #349 from FHenry/develop
Change size of element type
2012-08-28 09:25:08 -07:00
Laurent Destailleur
2a800816d9 Merge pull request #356 from cbattarel/develop
modify margin management for global discount + correct bug (wrong consta...
2012-08-28 09:24:06 -07:00
Laurent Destailleur
4bd6e9e6ad Merge pull request #355 from marcosgdf/cerfafr
Minor fixes to CerfaFR donation document
2012-08-28 09:09:29 -07:00
Regis Houssin
f9aca7ed18 Fix: changelog and copyright 2012-08-28 17:17:21 +02:00
Marcos García
55d7c6cd4e Added me to the COPYRIGHT file 2012-08-28 17:10:11 +02:00
Regis Houssin
4bb837dc6a Fix: update icon 2012-08-28 17:01:16 +02:00
Regis Houssin
c0bde33b1f Fix: [ task #498 ] add same tests in edit mode 2012-08-28 16:11:40 +02:00
Regis Houssin
62a7847c5b Fix: [ task #498 ] debug 2012-08-28 15:35:32 +02:00
Regis Houssin
ce9a16b341 Fix: button add not disabled 2012-08-28 14:42:46 +02:00
Regis Houssin
526f0e310b Fix: convert line delimiters 2012-08-28 12:38:07 +02:00
Regis Houssin
06b4cc3724 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-28 12:37:06 +02:00
Regis Houssin
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Marcos García
c8869e65a6 Minor fixes to CerfaFR donation document
* Title wasn't localized
* Fixed donation ref
2012-08-28 09:58:15 +02:00
Laurent Destailleur
562e2b6a7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-28 09:33:58 +02:00
Laurent Destailleur
26b05212c7 Fix: Missing include 2012-08-28 09:33:43 +02:00
Regis Houssin
57f5338e4f Merge pull request #353 from marcosgdf/coding-style
Refactored Mailmanspip class
2012-08-27 22:55:18 -07:00
Regis Houssin
84a634f7f0 Merge pull request #352 from marcosgdf/mailmanspip
Fixes to MailmanSPIP module
2012-08-27 22:53:33 -07:00
Marcos García
c302567d1d Refactored Mailmanspip class
Removed duplicated code
Added missing error tests and logs
2012-08-28 07:02:00 +02:00
Marcos García
afee791b35 Forgot to add the copyright 2012-08-28 05:53:44 +02:00
Marcos García
c6fe6c32bc Translated some MailmanSPIP strings 2012-08-28 05:46:48 +02:00
Marcos García
f64ab52993 Fixed MailmanSPIP problem + little refactor 2012-08-28 05:22:39 +02:00
Regis Houssin
eea7127aa2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 21:45:48 +02:00
Regis Houssin
e55c86074e Fix: compatibility with combobox 2012-08-27 21:45:19 +02:00
Laurent Destailleur
24c29e23f9 Fix: Force reload of index page when all boxes were removed. This is to
be sure to have the combo list complete after this refresh.
2012-08-27 21:16:26 +02:00
Laurent Destailleur
857a11f508 New: Can select thirdparties into emailing targets, even if module
category is not enabled.
2012-08-27 20:21:53 +02:00
Laurent Destailleur
80d9fb7134 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 20:02:42 +02:00
Laurent Destailleur
d0d5891eef New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes. 2012-08-27 20:02:23 +02:00
Laurent Destailleur
6c0dac2f17 More things to repair 2012-08-27 19:30:09 +02:00
Regis Houssin
10f9b53557 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 19:12:31 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
29fa8b64c4 Checkstyle 2012-08-27 18:04:00 +02:00
Laurent Destailleur
8a42cc26b7 Fix: Bad syntax of class name 2012-08-27 18:00:59 +02:00
Laurent Destailleur
60ad09db90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 17:56:10 +02:00
Laurent Destailleur
5e63642fcb Change to ignore bad detection of ident by PEAR code sniffer. 2012-08-27 17:55:15 +02:00
Regis Houssin
7ca0aa8a78 Fix: restore deprecated files 2012-08-27 17:23:35 +02:00
Regis Houssin
07a10d3984 Fix: add compatibility with old static combobox 2012-08-27 17:18:46 +02:00
Laurent Destailleur
426b3c2627 New: Adding a box add it on column with the less boxes. 2012-08-27 14:47:20 +02:00
Laurent Destailleur
b57de4fbac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 14:11:58 +02:00
Laurent Destailleur
1255699791 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
2012-08-27 14:11:17 +02:00
Regis Houssin
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Laurent Destailleur
625f53a708 Fix 4: test on selected value was lenght > 0 but if value is 0, lenght
is 1 and we want flase here.
Fix 5: Button Add is enabled once a predefined product is selected.
2012-08-27 13:54:14 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
cc22f25d97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 13:07:40 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00