Commit Graph

33590 Commits

Author SHA1 Message Date
Laurent Destailleur
4243f94f80 Merge pull request #424 from aspangaro/develop
Add function to choose chart of accounts
2012-10-02 14:10:50 -07:00
Laurent Destailleur
883e51566f Merge pull request #432 from grandoc/develop
try to fix canvas within members module
2012-10-02 14:10:10 -07:00
Grand Philippe
ec9946222d new try to fix canvas within members module 2012-10-02 22:58:49 +02:00
Laurent Destailleur
82eacec792 Merge pull request #431 from atm-maxime/mko104
Task # 104 : Can create an invoice from several orders
2012-10-02 11:38:35 -07:00
Laurent Destailleur
8d39e57ad3 Add dump for 3.3 2012-10-02 19:55:34 +02:00
Laurent Destailleur
bef9fd152b Fix: table creation scripts 2012-10-02 19:42:44 +02:00
Grand Philippe
085923dc64 try to fix canvas within members module 2012-10-02 18:27:41 +02:00
Maxime Kohlhaas
3ca55eb058 Task # 104 : display invoice multi order link on third party page only if there are orders to bill + translations 2012-10-02 10:52:08 +02:00
Spangaro Alexandre
3ae6117e16 Reintegrate accounting.php in admin 2012-10-02 06:07:57 +02:00
Spangaro Alexandre
5c56bd629b Fix: add country in request 2012-10-02 05:45:50 +02:00
Spangaro Alexandre
8a99eedc6c Hum... Now it's work ! Little fix 2012-10-02 05:45:50 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Laurent Destailleur
079ea61582 Fix: W3C 2012-10-02 00:36:23 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559
Task # 559 : add discount on supplier prices
2012-10-01 13:31:17 -07:00
Laurent Destailleur
6971cf5779 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-01 22:05:22 +02:00
Laurent Destailleur
32fdfbb1cb Fix: Styles 2012-10-01 21:53:22 +02:00
Laurent Destailleur
43dce1c3fa Merge pull request #426 from grandoc/develop
add canvas to adherents module
2012-10-01 12:39:09 -07:00
Laurent Destailleur
4a9db063c2 Fi: Uninstall not complete 2012-10-01 20:58:39 +02:00
Maxime Kohlhaas
8a62af1c78 Task # 559 : added use of discount in supplier bills 2012-10-01 11:49:20 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Maxime Kohlhaas
f62772a1c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-10-01 11:26:42 +02:00
Maxime Kohlhaas
1d21f24fa7 Task # 559 : Add possibility to define a discount for min quantity on supplier product prices 2012-10-01 11:25:17 +02:00
Maxime Kohlhaas
6329c01d5d Added link to multi-origin invoicing on thirdparty page 2012-10-01 11:23:51 +02:00
Regis Houssin
8c17266ed4 Merge pull request #425 from marcosgdf/translations
Added missing & improved es_ES translations
2012-10-01 01:11:30 -07:00
Regis Houssin
7837356fe9 Merge pull request #423 from simnandez/develop
Trad: Add missing translations
2012-10-01 01:11:14 -07:00
Grand Philippe
0215ce9122 add canvas to adherents module 2012-10-01 10:05:03 +02:00
Marcos García
a4b0f7e521 Fixed es_ES typo 2012-10-01 04:17:17 +02:00
Marcos García
13cbf154e1 Added missing & improved es_ES translations 2012-10-01 03:09:37 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a Fix: doxygen 2012-09-30 20:49:13 +02:00
Regis Houssin
422f028ac9 Fix: use ADHERENT_BANK_USE for check or not bank via invoice
Fix: code optimizing
2012-09-29 12:07:07 +02:00
Regis Houssin
c3dd8348fe Fix: PEAR packages upgrade in Jenkins server has caused problems with
CodeSniffer. The exclusion directory was no longer taken. I restored the
server backup.
2012-09-28 20:54:47 +02:00
Regis Houssin
025211fa3d Fix: try again 2012-09-28 18:17:19 +02:00
Regis Houssin
44dde562fa regression and add slash at end 2012-09-28 17:51:35 +02:00
Regis Houssin
d8a0fed001 Fix: try to add all subdir 2012-09-28 17:11:53 +02:00
Regis Houssin
4f115268a9 Fix: try this for subdir 2012-09-28 16:55:09 +02:00
Laurent Destailleur
e9c222a82b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:39:45 +02:00
Regis Houssin
5e1cbc77e4 Fix: try to use full path 2012-09-28 16:37:16 +02:00
Regis Houssin
265c2a4be4 Fix: avoid error 2012-09-28 16:24:54 +02:00
Laurent Destailleur
918d5c9aa2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:20:10 +02:00
Regis Houssin
b994eeb15f try to exclude with another method 2012-09-28 16:13:31 +02:00
Laurent Destailleur
9db72fb50d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
simnandez
6bbcb376b1 Trad: Add missing translations 2012-09-28 15:55:50 +02:00
Regis Houssin
666854f1fb Fix: try another method 2012-09-28 15:37:33 +02:00
Regis Houssin
9f042c9d78 Merge pull request #422 from atm-maxime/develop
Task # 355 : corrections
2012-09-28 06:06:59 -07:00
Maxime Kohlhaas
6ac83a4205 Task # 355 : last correction 2012-09-28 14:58:47 +02:00
Maxime Kohlhaas
4deae1d948 Task # 355 : corrections + added on edit mode 2012-09-28 14:56:47 +02:00
Regis Houssin
987fd9ef2b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-28 14:46:40 +02:00