lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,635 Commits 43 Branches 150 Tags 886 MiB
e86800516e
Commit Graph

36635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e86800516e Merge pull request #895 from jfefe/develop 
Fix : use standard method to show extrafields on propal
 2013-04-27 14:24:51 -07:00
jfefe
54f0d1b1a5 Fix : use standard method to show extrafields 2013-04-27 22:57:29 +02:00
Laurent Destailleur
4c9a728799 Merge pull request #890 from marcosgdf/translations 
Improved translations
 2013-04-27 12:53:15 -07:00
simnandez
823b716042 Trad: Add ca_ES holiday translations 2013-04-27 17:52:14 +02:00
simnandez
d982148b7b Fix: [ bug #855 ] Holiday approval email in French 2013-04-27 17:20:02 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
Marcos García
be5fcfdce3 Improved es_ES translations + replaced lang key in margins module admin page 2013-04-27 12:56:57 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Marcos García
5784cb120a Moved GenbarcodeLocation from products.lang to admin.lang 2013-04-27 12:32:20 +02:00
Laurent Destailleur
50dd0ef7ee Merge pull request #885 from FHenry/develop 
Review extrafield for compliance with wiki
 2013-04-26 13:08:37 -07:00
Laurent Destailleur
b721111409 Merge pull request #883 from marcosgdf/bug-846 
Fixed bug #846: Create a supplier invoice (without project)
 2013-04-26 13:05:52 -07:00
Laurent Destailleur
0a282c018a Merge pull request #886 from jfefe/doc_ods 
Using of MAIN_DOC_USE_TIMING on ODT
 2013-04-26 13:04:08 -07:00
Laurent Destailleur
f04abccdf3 Look cleaner 2013-04-26 21:07:51 +02:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
162cb4ffea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 19:17:51 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
53ca1546d0 Fetch optionnal into fetch of propal 2013-04-26 16:58:04 +02:00
fhenry
e76f997ded Fix adherent class mistake 2013-04-26 16:53:22 +02:00
fhenry
5d8e541292 Fetch_optionals into fetch commande 2013-04-26 16:51:01 +02:00
Regis Houssin
d25687276e Fix: bypass the second test if the first is ok 2013-04-26 16:29:29 +02:00
Regis Houssin
3684271627 Fix: avoid error 2013-04-26 16:21:48 +02:00
Regis Houssin
34036c2a5c Fix: big security problem with multicompany 2013-04-26 16:07:35 +02:00
fhenry
c988944f1a PDF admin : Add option to hide num TVA intra into adress of customer 2013-04-26 13:25:51 +02:00
Regis Houssin
3b934118c5 Fix: security problem with multicompany 2013-04-26 12:36:02 +02:00
fhenry
b9f7d4c302 Fix bug on invoice extrafield type date 2013-04-26 12:20:15 +02:00
fhenry
30ad2f1609 Fix bug in fetch_optionals 2013-04-26 10:51:17 +02:00
fhenry
b4f3e9d5a8 fix table name in migration script 2013-04-26 10:34:11 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
jfefe
34749d9f72 Merge branch 'doc_ods' of github.com:jfefe/dolibarr into doc_ods 2013-04-26 08:49:21 +02:00
jfefe
8835868749 Implement MAIN_DOC_USE_TIMING into project and order ODT 2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3 Use MAIN_DOC_USE_TIMING on invoices (odt) 2013-04-26 08:48:44 +02:00
jfefe
036e81a089 Use MAIN_DOC_USE_TIMING on proposals (ODT) 2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING) 2013-04-26 08:48:43 +02:00
fhenry
d0f44bf25f Add zero entity into extrafeild deletion 2013-04-26 08:46:25 +02:00
Marcos García
6ac6f6e911 Fixed bug #846: Create a supplier invoice (without project) 2013-04-26 06:34:41 +02:00
jfefe
44712ea99a Implement MAIN_DOC_USE_TIMING into project and order ODT 2013-04-26 01:33:56 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto 
several lines.
 2013-04-25 23:49:24 +02:00
Laurent Destailleur
4c1f301f4e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-25 20:39:47 +02:00
Laurent Destailleur
3ecb61f18e Fix: Using div 2013-04-25 20:36:38 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Regis Houssin
4f600b6465 Fix: use $conf->entity if defined 2013-04-25 15:53:20 +02:00
Regis Houssin
ce3b8e5cc8 Fix: broken features with multicompany 2013-04-25 15:49:27 +02:00
Laurent Destailleur
edc84f4168 Fix: Label must be same into combo list than into admin page. 2013-04-25 13:12:57 +02:00
Laurent Destailleur
0a5415ee2a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-25 13:09:28 +02:00
Laurent Destailleur
542a9608a7 Missing translation 2013-04-25 13:04:06 +02:00
simnandez
9dde709c3e Fix: typo errors 2013-04-25 13:01:38 +02:00
Laurent Destailleur
726c83d2d2 Merge pull request #877 from FHenry/develop 
Fix bug on Extrafield list table type
 2013-04-25 01:23:57 -07:00
Laurent Destailleur
023b6f2e8b Fix: Use entity 2013-04-25 10:22:08 +02:00