Commit Graph

41162 Commits

Author SHA1 Message Date
Florian Henry
0e6161628c Fix choix_date wizard 2014-04-09 17:41:44 +02:00
Florian Henry
62b856527f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-09 17:30:23 +02:00
Laurent Destailleur
b586b74c79 Fix: Try/catch 2014-04-09 17:07:27 +02:00
Laurent Destailleur
13929bc46f New: showrefnav can be used with tables without prefix. 2014-04-09 13:19:31 +02:00
Laurent Destailleur
30dae3def2 Doc 2014-04-08 23:28:26 +02:00
Laurent Destailleur
89dca04720 Update doc 2014-04-08 23:06:58 +02:00
Laurent Destailleur
ab3bbf8e0b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop
2014-04-07 13:15:26 +02:00
Laurent Destailleur
2035e6e648 Fix: The " " is not more allowed as value for SeparatorThousand. We must
use "Space". This solve a lot of problem into translation process.
2014-04-07 13:08:04 +02:00
Laurent Destailleur
a96f762f40 Sync from transifex. 2014-04-07 09:23:50 +02:00
Laurent Destailleur
dc6a09f746 Doc 2014-04-07 00:00:30 +02:00
Laurent Destailleur
2b38ec3912 Merge pull request #1526 from defrance69/patch-4
Update fournisseur.commande.class.php
2014-04-06 23:45:07 +02:00
Laurent Destailleur
26fa5c0857 Merge pull request #1525 from grandoc/debug
anglicized
2014-04-06 23:44:47 +02:00
Laurent Destailleur
5eeb6b8445 Fix: Use "Space" instead of " " when we need space as Thousand
Separator.
2014-04-06 23:43:32 +02:00
Laurent Destailleur
6a916a4ce9 Add sq_AL (albanian) language 2014-04-06 23:29:07 +02:00
BENKE Charles
def7d1d2c8 Update fournisseur.commande.class.php
$id not defined but used
2014-04-06 21:21:08 +02:00
Laurent Destailleur
1c21c00fb6 New: Can use "Space" as value for SeparatorThousand into language files 2014-04-06 21:18:21 +02:00
Laurent Destailleur
a2531872cb Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 2014-04-06 21:17:35 +02:00
Laurent Destailleur
5aee7131af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-06 20:47:29 +02:00
Laurent Destailleur
18f4eabbdf Update conf template 2014-04-06 19:09:10 +02:00
philippe
8dc23025ed anglicized 2014-04-06 16:06:54 +02:00
Grand Philippe
3734c4de0b Merge branch 'develop' into debug 2014-04-06 15:59:03 +02:00
Laurent Destailleur
b77e068a72 New: More information into email confirm for paybox payment. 2014-04-06 15:01:45 +02:00
Laurent Destailleur
2be6b2ecf7 Fix: var not initialized 2014-04-06 14:53:42 +02:00
Laurent Destailleur
6cb39ea3dc Fix: Missing message keys 2014-04-06 14:49:04 +02:00
Laurent Destailleur
d595b96c8e New: Paypal return for subscription show more information and direct
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
2014-04-06 14:22:08 +02:00
philippe
43c85cc446 anglicized 2014-04-05 17:14:57 +02:00
Laurent Destailleur
688ce704ec Fix: Doxygen 2014-04-05 15:14:19 +02:00
Laurent Destailleur
8405ec4816 Syntax error 2014-04-05 14:10:18 +02:00
Laurent Destailleur
c7c640f925 Fix: Can't add user 2014-04-05 12:38:59 +02:00
Laurent Destailleur
d2b1b1a86c Merge branch 'actiontriggers' of
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang
2014-04-04 23:47:36 +02:00
Florian Henry
090fd4811c Fix choix date in survey 2014-04-04 11:31:39 +02:00
Laurent Destailleur
925a58028a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-02 18:46:23 +02:00
Laurent Destailleur
262efb997f Fix: paddingrightonly must use $right and $left to be compatible with
LTR languages.
2014-04-02 18:45:59 +02:00
Laurent Destailleur
b799d6a392 Merge pull request #1523 from GPCsolutions/regensuporder
Regenerate document on supplier orders steps
2014-04-02 17:43:03 +02:00
Raphaël Doursenaud
6d7728d9bf Regenerate document on supplier orders steps 2014-04-02 15:37:19 +02:00
Laurent Destailleur
0e23892c71 More consistency trigger name 2014-04-02 15:05:03 +02:00
Laurent Destailleur
637b47cd08 Merge pull request #1522 from GPCsolutions/triggernames
Qual: keep trigger naming consistent
2014-04-02 15:02:42 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Raphaël Doursenaud
3b9696351e Qual: keep trigger naming consistent 2014-04-02 12:22:38 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
2014-04-02 11:41:55 +02:00
Laurent Destailleur
3f99d9c866 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-02 11:36:34 +02:00
Laurent Destailleur
46e46507ec Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/comm/action/index.php
	htdocs/compta/bank/class/account.class.php
	htdocs/compta/bank/index.php
2014-04-02 11:33:47 +02:00
Laurent Destailleur
8cb06cac08 FIX : [ bug #1317 ] Removing a category does not remove all child
categories
2014-04-02 11:27:11 +02:00
Cedric
a4797a0e4a FIX : [ bug #1317 ] Removing a category does not remove all child categories 2014-04-02 11:25:17 +02:00
Laurent Destailleur
663a3bd45c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-02 11:21:11 +02:00
Laurent Destailleur
c421613da9 Merge pull request #1520 from KreizIT/fix_1317
FIX : [ bug #1317 ] Removing a category does not remove all child categories
2014-04-02 11:20:47 +02:00
Laurent Destailleur
efcd822c27 Merge pull request #1517 from defrance69/patch-3
Update propal.class.php
2014-04-02 11:19:42 +02:00
Laurent Destailleur
ab6a67054a Merge pull request #1516 from marcosgdf/multicompany-fixes
Fixed a problem with bank accounts sharing across entities
2014-04-02 11:16:48 +02:00
Laurent Destailleur
487a341a91 Merge pull request #1518 from altairis-fr/develop
add trigger CREATE_BUYPRICE
2014-04-02 11:16:21 +02:00