Laurent Destailleur
|
63e1ecccd3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-11-20 12:46:05 +01:00 |
|
Laurent Destailleur
|
b04a12c39a
|
Missing vat rate for canada
|
2013-11-20 12:45:38 +01:00 |
|
Regis Houssin
|
4c29bddfda
|
Fix: wrong variable name
Fix: restore address.class.php, this class is used
|
2013-11-20 09:40:56 +01:00 |
|
Regis Houssin
|
f305524e29
|
Revert "Qual: Removed not used file"
This reverts commit 603c2aa938.
|
2013-11-20 09:34:54 +01:00 |
|
Laurent Destailleur
|
c92d0fe966
|
Fix: phpunit
|
2013-11-19 23:06:25 +01:00 |
|
Laurent Destailleur
|
0e743d5024
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
|
2013-11-19 21:08:02 +01:00 |
|
Laurent Destailleur
|
568c296c6c
|
Merge pull request #1310 from GPCsolutions/develop-nocrlf
Use LF instead of CRLF
|
2013-11-19 11:44:51 -08:00 |
|
Laurent Destailleur
|
25bbe824f1
|
Merge pull request #1309 from csalvador/develop-formcontract-include
included the FormContract class to avoid fatal error
|
2013-11-19 11:43:53 -08:00 |
|
Laurent Destailleur
|
583a3dadb1
|
Merge pull request #1308 from FHenry/3.4
[ bug #1142 ] Set paiement on invoice
|
2013-11-19 11:43:21 -08:00 |
|
Laurent Destailleur
|
0f9f610635
|
Merge pull request #1311 from GPCsolutions/develop-fixaddline
Make AJAX new line form work again
|
2013-11-19 11:43:01 -08:00 |
|
Raphaël Doursenaud
|
7945011955
|
Make AJAX new line form work again
FIXME: Factorize!
|
2013-11-19 17:54:36 +01:00 |
|
Raphaël Doursenaud
|
83f99b5ba6
|
Use LF instead of CRLF
|
2013-11-19 14:36:55 +01:00 |
|
Cédric Salvador
|
c885389ac6
|
included the FormContract class to avoid fatal error
|
2013-11-19 14:23:17 +01:00 |
|
Florian Henry
|
68718c6100
|
Update changelog
|
2013-11-19 10:42:29 +01:00 |
|
Florian Henry
|
870b78fc19
|
[ bug #1142 ] Set paiement on invoice
|
2013-11-19 10:41:00 +01:00 |
|
Laurent Destailleur
|
6596a105e7
|
Merge pull request #1307 from hameau/patch-2
Update printipp.lang
|
2013-11-18 11:43:50 -08:00 |
|
Laurent Destailleur
|
04efe611af
|
Merge pull request #1306 from hameau/patch-1
Update main.lang
|
2013-11-18 11:42:48 -08:00 |
|
hameau
|
9d2dee207a
|
Update bills.lang
Minor typos
|
2013-11-18 18:13:34 +01:00 |
|
hameau
|
a94fb12e5e
|
Update other.lang
Minor typo
|
2013-11-18 18:07:17 +01:00 |
|
hameau
|
c04d454d4f
|
Update withdrawals.lang
Minor typos.
|
2013-11-18 18:05:36 +01:00 |
|
hameau
|
0501491475
|
Update printipp.lang
Minor typos; minor translation fr->en.
|
2013-11-18 17:45:19 +01:00 |
|
hameau
|
b28d15574e
|
Update main.lang
Minor typos; capitalise month names; minor fr->en.
|
2013-11-18 17:34:08 +01:00 |
|
Laurent Destailleur
|
a71e4c598a
|
Fix: Must navigate between all thirdparties elligible for tab.
|
2013-11-18 15:41:42 +01:00 |
|
Laurent Destailleur
|
4d31a0ca2a
|
Fix: Removed duplicate line
|
2013-11-18 14:27:17 +01:00 |
|
Laurent Destailleur
|
2d260fa6dd
|
Fix: Missing alignement
|
2013-11-18 14:25:53 +01:00 |
|
Laurent Destailleur
|
69f0d596ba
|
Fix: Pagination
|
2013-11-18 12:20:53 +01:00 |
|
Laurent Destailleur
|
e8101e3cde
|
Fix: Missing field
|
2013-11-18 12:00:42 +01:00 |
|
Laurent Destailleur
|
2b63fd67b5
|
Minor fix in cron feature
|
2013-11-18 11:42:28 +01:00 |
|
Laurent Destailleur
|
5703dfe55a
|
Trans
|
2013-11-18 11:31:34 +01:00 |
|
Laurent Destailleur
|
3884c33535
|
Merge pull request #1304 from altairis-fr/3.4
Fix bad translation on margin config
|
2013-11-17 16:15:23 -08:00 |
|
Laurent Destailleur
|
d209d931e4
|
Doxygen
|
2013-11-18 00:29:11 +01:00 |
|
Laurent Destailleur
|
4356496ee8
|
Qual: File is not a class of a module
|
2013-11-18 00:20:05 +01:00 |
|
Laurent Destailleur
|
afa5bdb837
|
Fix: phpunit error
|
2013-11-18 00:12:13 +01:00 |
|
Laurent Destailleur
|
56867b6fd9
|
Fix: Removed duplicate tests
|
2013-11-17 23:45:17 +01:00 |
|
Laurent Destailleur
|
6a5b3e2020
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-11-17 23:26:37 +01:00 |
|
Laurent Destailleur
|
48570f599a
|
Fix: form is not allowed into a table. This break some javascript and
make some browsers crazy.
|
2013-11-17 23:25:25 +01:00 |
|
Christophe Battarel
|
89a5638908
|
Fix bad translation on margin config
|
2013-11-17 12:59:33 +01:00 |
|
Laurent Destailleur
|
930328f235
|
Prepare 3.5 beta
|
2013-11-17 03:33:58 +01:00 |
|
Laurent Destailleur
|
0f4ceca8ec
|
Fix: tons of bugs into ecm module
|
2013-11-17 02:59:01 +01:00 |
|
Laurent Destailleur
|
45aac81b71
|
Doc: More comments
|
2013-11-16 18:12:13 +01:00 |
|
Laurent Destailleur
|
33d55faf6b
|
Fix: error into dump file
|
2013-11-16 15:42:05 +01:00 |
|
Laurent Destailleur
|
3c0ee64648
|
New: Add links to social networks
|
2013-11-16 15:40:46 +01:00 |
|
Laurent Destailleur
|
946c91dc72
|
Fix: Removed deprecated support links
|
2013-11-16 15:08:57 +01:00 |
|
Laurent Destailleur
|
d28eacebd7
|
Fix: Remove an edit button that is not implemented.
|
2013-11-16 14:53:08 +01:00 |
|
Laurent Destailleur
|
8ec50fce23
|
Move warning at correct place.
Fix: Reset of amount was not working
|
2013-11-16 14:26:42 +01:00 |
|
Laurent Destailleur
|
b7190d2609
|
Fix: Several bugs.
|
2013-11-16 13:00:21 +01:00 |
|
Laurent Destailleur
|
5b243abe4b
|
Fix: Miscellaneous fixes
|
2013-11-16 12:00:08 +01:00 |
|
Laurent Destailleur
|
c5230ea2ff
|
Fix: option --skip on by default
|
2013-11-15 23:39:44 +01:00 |
|
Laurent Destailleur
|
d0d9cce146
|
Fix: price should not be used to compare amounts. Price is a formated
string, not an amount.
|
2013-11-15 22:15:48 +01:00 |
|
simnandez
|
c8f1a26d25
|
Format with price function
|
2013-11-15 17:55:48 +01:00 |
|