Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,136 Commits 36 Branches 190 Tags
2c51b51a88a8eb50aef84482a6c4c254bfb27fca
Commit Graph

3677 Commits

Author SHA1 Message Date
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
0f6506d457 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:57:55 +01:00
Laurent Destailleur
1bed4aa193 Merge pull request #602 from FHenry/develop 
Add boolean (checkbox) standard extrafield feature
 2013-01-12 06:53:48 -08:00
Laurent Destailleur
8152dda733 Merge pull request #601 from simnandez/develop 
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
 2013-01-12 06:45:34 -08:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch 
New: Add hook for agenda, info and category tabs
 2013-01-12 14:34:16 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00
simnandez
96c5eacf4a [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 09:58:21 +01:00
Christophe Battarel
62ccb57857 fix missing td 2013-01-11 15:41:47 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Laurent Destailleur
37b6bab893 Fix: Missing lang loading 2013-01-10 22:45:55 +01:00
Laurent Destailleur
03b906808e Merge pull request #593 from marcosgdf/eu-vat 
Updated EU VAT area links and added Isle of Man
 2013-01-10 12:12:25 -08:00
Marcos García
8e7a66a544 Fixed indentation problem 2013-01-10 14:20:03 +01:00
Marcos García
809367d23b Updated EU VAT area links and added Isle of Man 
Isle of Man is in included in UK state as shown in http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
 2013-01-10 14:17:43 +01:00
Marcos García
593db37423 Function getTotalDiscount of commonobject.class.php should always return a float for precission 2013-01-10 13:53:46 +01:00
Laurent Destailleur
8ac33e98e7 Fix: property object_total_discount was not working when quantity was 
not 1.
 2013-01-10 12:58:46 +01:00
Laurent Destailleur
9d886eca53 Fix: Scan of correct dir when them dir is forced 2013-01-10 11:19:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Laurent Destailleur
abccfdd168 Fix: Option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-09 19:56:43 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
f3df7a2fec Fix: An easier to understand fix. Remove also not recommanded "continue 
2" instructions.
 2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c Merge pull request #581 from simnandez/3.3 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
 2013-01-08 13:38:38 -08:00
Regis Houssin
dd08da6ea8 Merge pull request #583 from FHenry/develop 
[ task #664 ] Add extrafields behaviours to Member Type
 2013-01-08 10:58:46 -08:00
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
Laurent Destailleur
b7a5e226c9 Fix: Disable menu entry of a not avilable feature 2013-01-08 18:53:45 +01:00
Laurent Destailleur
9b6289503c Fix: Overwriting of login template works with module_parts. 2013-01-08 18:30:49 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
Laurent Destailleur
9b3874f6f9 Fix: PHPUnit found regression 2013-01-08 12:26:02 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
77f177d846 Fix: Bad selection of option 2013-01-08 11:04:29 +01:00
simnandez
596df78d39 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-08 08:46:48 +01:00
Laurent Destailleur
f96c1d83cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 23:22:20 +01:00
Laurent Destailleur
0889bdc3eb Fix: Error using static method 2013-01-07 23:20:00 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
de83dc68e1 New: Uniformize odt generation to use hooks like pdf generation 2013-01-07 02:24:20 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
Laurent Destailleur
4e27969317 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-02 22:15:58 +01:00
Laurent Destailleur
b667400cc1 Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 21:35:28 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Laurent Destailleur
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
BENKE Charles
4eab7b004e Update htdocs/core/boxes/box_activity.php 
new release with "last 2 year bills"
 2013-01-02 11:08:05 +01:00
Laurent Destailleur
049a6dc742 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-31 14:00:38 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00