Commit Graph

28953 Commits

Author SHA1 Message Date
Laurent Destailleur
fa016baa7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 17:48:09 +02:00
Laurent Destailleur
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +02:00
Laurent Destailleur
315670273d Merge pull request #434 from grandoc/develop
try to fix canvas issue
2012-10-03 06:16:35 -07:00
Laurent Destailleur
a821d6cafe Fix: We use dolibarr_details as type of DolEditor here, because we
must not accept images as description is included into PDF and not
accepted by TCPDF.
2012-10-03 14:52:01 +02:00
Laurent Destailleur
1d9e77a53d Fix: We use dolibarr_details as type of DolEditor here, because we must
not accept images as description is included into PDF and not accepted
by TCPDF.
2012-10-03 14:49:51 +02:00
Laurent Destailleur
0f78ffda5c New: POS module can works with only one payment method (cach, chq,
credit card).
2012-10-03 14:45:58 +02:00
Grand Philippe
fb487ff855 try to fix canvas issue 2012-10-03 14:20:04 +02:00
Laurent Destailleur
61958f445d Fix translation 2012-10-03 14:15:07 +02:00
Laurent Destailleur
3bd20ee8ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 13:04:29 +02:00
Laurent Destailleur
6d8ea8dcd5 Update trans 2012-10-03 13:04:18 +02:00
Regis Houssin
4ed05b5b2e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-03 12:41:02 +02:00
Regis Houssin
935bb09b99 Fix: better translation 2012-10-03 12:39:48 +02:00
Laurent Destailleur
9997d6ca15 Fix: Other minor fixes 2012-10-03 11:53:14 +02:00
Laurent Destailleur
9dac672ca6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 11:43:51 +02:00
Laurent Destailleur
2617fc21a6 Some fix: List of invoices to show in "to bill" menu must contains
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
2012-10-03 11:43:39 +02:00
Regis Houssin
18015986b6 Fix: bad field name 2012-10-03 11:38:18 +02:00
simnandez
921795e562 Task # 104 : Remove MAIN_FEATURES_LEVEL 2012-10-03 09:16:27 +02:00
Regis Houssin
fc1cc95d08 Fix: bad path 2012-10-03 08:54:21 +02:00
Laurent Destailleur
44ee8b8e38 Doxygen 2012-10-03 00:39:34 +02:00
Laurent Destailleur
c25e908b75 Doxygen 2012-10-03 00:30:50 +02:00
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
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
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