Commit Graph

33876 Commits

Author SHA1 Message Date
Maxime Kohlhaas
fc7bc7e5d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-26 01:00:22 +02:00
Maxime Kohlhaas
0f1617c31d Task 559 : add use of price by qty in product selection (select and ajax search) 2012-10-26 01:00:03 +02:00
Regis Houssin
b5d70ad17f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1 New: add export filters (thank you Charles Benke) 2012-10-25 22:30:17 +02:00
Regis Houssin
62cbae7985 Merge pull request #463 from simnandez/develop
Fix: Bad ProfId assignation in imports
2012-10-25 08:20:35 -07:00
simnandez
e89a06bb9c Fix: Bad ProfId assignation in imports 2012-10-25 17:08:25 +02:00
Regis Houssin
4a99480da4 Merge pull request #462 from cbattarel/develop
fix minor bugs in invoice and order creation from another object
2012-10-25 06:56:49 -07:00
Christophe Battarel
2272d13f5a fix minor bug in invoice creation from another object 2012-10-25 15:50:43 +02:00
Christophe Battarel
135342b085 fix minor bugs in order creation from another object 2012-10-25 15:47:35 +02:00
Regis Houssin
4f1ef1bcf8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 15:01:26 +02:00
Regis Houssin
89b794dcd0 Fix: avoid errors with IE 2012-10-25 15:01:04 +02:00
Laurent Destailleur
7b92f66fab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop
2012-10-25 13:17:35 +02:00
Laurent Destailleur
daeb1029a1 New: Support field required or not 2012-10-25 13:11:55 +02:00
Laurent Destailleur
d142dec69a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-25 12:45:01 +02:00
Regis Houssin
53b9a95742 Merge pull request #461 from cbattarel/develop
fix wrong test for product type in order->getNbProductsLines()
2012-10-25 02:49:17 -07:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Christophe Battarel
144b08cac1 fix wrong test for product type in order->getNbProductsLines()
also add getNbServicesLines() function in order class.
2012-10-25 11:26:36 +02:00
Laurent Destailleur
2953ef37e6 Methods works with most tables/elements 2012-10-25 10:06:29 +02:00
Regis Houssin
f8f1d3a0df Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement
mode and paiement method in pdf
2012-10-25 09:24:05 +02:00
Regis Houssin
1cbd2a1b1c Fix: broken feature 2012-10-25 08:45:35 +02:00
Maxime Kohlhaas
84df6bd639 Task # 559 : forgot to update supplier prices sql table 2012-10-25 08:19:16 +02:00
Maxime Kohlhaas
03cf96ed31 Task # 559 : add discount by qty as done in supplier prices 2012-10-25 08:18:59 +02:00
Maxime Kohlhaas
6ffa8532c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-25 07:56:30 +02:00
Regis Houssin
23707e2346 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0 Fix: strict mode 2012-10-24 22:50:19 +02:00
Laurent Destailleur
773b082b13 Fix: Restore private: The public method to use by external code is
addExtraField.
2012-10-24 21:28:24 +02:00
Laurent Destailleur
1b116c05ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-24 21:21:58 +02:00
Laurent Destailleur
d1a4a6a090 New: Support synchro of field job/title.
New: Add script to synchronize users from ldap to dolibarr.
2012-10-24 21:19:10 +02:00
Laurent Destailleur
afb94c5014 Fix: Avoid warning 2012-10-24 21:16:58 +02:00
Regis Houssin
abb5047979 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 18:41:51 +02:00
Regis Houssin
5c78b2d5dd Fix: possibility to use this function in external module class 2012-10-24 18:41:22 +02:00
Laurent Destailleur
c88d8f5d0e Fix: Resotre synchro ldap 2 dolibarr 2012-10-24 17:35:28 +02:00
Laurent Destailleur
f701c1afba Fix translations 2012-10-24 17:33:47 +02:00
Laurent Destailleur
ec10bf4112 New: Add test for synchro ldap 2 dolibarr 2012-10-24 17:33:32 +02:00
Laurent Destailleur
0d92fe2de1 Normalize code 2012-10-24 17:32:10 +02:00
Laurent Destailleur
9c7b9f744f Removed deprecated field 2012-10-24 17:31:02 +02:00
Laurent Destailleur
4fd79a4675 Qual: Removed deprecated field 2012-10-24 17:30:23 +02:00
Maxime Kohlhaas
fdc6ed90a4 Task # 559 : forgot to update product_price table to add column 2012-10-24 17:22:45 +02:00
Maxime Kohlhaas
21875a5e4a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-24 17:18:42 +02:00
Maxime Kohlhaas
2ff77bb2f1 Task # 559 : no need for a max quantity 2012-10-24 17:18:11 +02:00
Maxime Kohlhaas
35773d08ff Task # 559 : mysql table creation + index and constraints 2012-10-24 17:16:03 +02:00
Laurent Destailleur
0b32b24eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-24 16:25:22 +02:00
Laurent Destailleur
2f4f427d9e Fix: ldap errors 2012-10-24 16:25:09 +02:00
Regis Houssin
1c84dbaeec Fix: missing zipcode in url 2012-10-24 12:27:43 +02:00
Regis Houssin
def1617f01 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 12:19:05 +02:00
Regis Houssin
382f1a54c3 Fix: add key generator in agenda xcal admin page 2012-10-24 12:18:40 +02:00
Regis Houssin
984bed9655 Merge pull request #459 from FHenry/develop
[ task #581 ] Implement function DDLInfoTable for PostgreSQL db class
2012-10-24 02:54:16 -07:00
fhenry
597ba3e6fc [ task #581 ] Implement function DDLInfoTable for PostgreSQL db class 2012-10-24 11:37:00 +02:00
Regis Houssin
87d44c845d Fix: restrict the search in the beginning 2012-10-24 11:18:15 +02:00
Regis Houssin
1055cf4e53 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 10:19:46 +02:00