Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,384 Commits 36 Branches 190 Tags
18b55d5503225841e65b51b2fabd6d97eb82f6ef
Commit Graph

2189 Commits

Author SHA1 Message Date
Laurent Destailleur
ea4b324e25 Merge pull request #943 from defrance69/patch-7 
Update dolgraph.class.php
 2013-05-13 15:41:36 -07:00
Laurent Destailleur
273fbdfa0e Merge pull request #942 from FHenry/3.4 
Remove warning if FetchObjectLinked call
 2013-05-13 15:38:28 -07:00
Laurent Destailleur
df6c796413 Fix: [ bug #889 ] Titre civilité ne s'affiche 2013-05-12 17:09:48 +02:00
fhenry
111fc3153b Fix Extrafield selllist bug in PgSQL 2013-05-12 15:45:23 +02:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
BENKE Charles
4f28c3dd41 Update dolgraph.class.php 
jflot can't manage more than 2 bars but can manage more than 3 lines.
 2013-05-11 00:13:27 +03:00
fhenry
1a7a8817be Update wrong comment 2013-05-10 18:40:19 +02:00
fhenry
0d13b8d194 Fix previous bug 2013-05-10 18:35:19 +02:00
fhenry
4bb6bd8697 Order result fetchObjectLinked by sourcetype 2013-05-10 18:23:13 +02:00
fhenry
3a05d6c641 Remove warning if FetchObjectLinked call 2013-05-10 17:50:14 +02:00
fhenry
8542a4fd28 Fix date extrafield message old datetimeformat use message in log 2013-05-10 16:34:14 +02:00
Laurent Destailleur
9b30f116f1 Fix: Some lib missing when jmobile enabled. 2013-05-10 12:48:11 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +02:00
fhenry
d8f1818f86 Fix margin calculation problem, and add myuser_fullname and myuser_logo 
into standard ODT replacement
 2013-05-03 15:44:35 +02:00
Laurent Destailleur
77956a5676 Merge pull request #911 from atm-maxime/develop 
Fix : extrafields were save without escape
 2013-05-02 10:43:14 -07:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02:00
Maxime Kohlhaas
80cf467c47 Fix : extrafields were save without escape 2013-05-02 12:14:29 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +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
Laurent Destailleur
3203283fe9 Fix: remove warning 2013-04-27 12:24:48 +02:00
fhenry
30ad2f1609 Fix bug in fetch_optionals 2013-04-26 10:51:17 +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
fhenry
d0f44bf25f Add zero entity into extrafeild deletion 2013-04-26 08:46:25 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +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
cce857d6ee Fix: When box is removed, it is added into combo box of available boxes. 2013-04-25 01:35:33 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
8c440b3f57 Remove entity check in list table extrafield 2013-04-25 00:14:43 +02:00
fhenry
507da4fc3b Add Zero entity to shared extrafield 2013-04-25 00:09:47 +02:00
fhenry
f1a97d4705 remove ver_export 2013-04-25 00:02:29 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7fdf2f3482 Fix for php 5 2013-04-24 23:54:02 +02:00
fhenry
928a1afe18 Fix bug on Extrafield list table type 2013-04-24 21:32:22 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
fhenry
5789a5d6e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 17:53:59 +02:00
fhenry
9ce7e44f00 use price method rather than price2num. price are use in all PDF, so it 
should be the same on ODT
 2013-04-24 16:47:15 +02:00
Laurent Destailleur
9a2b72f8f8 Compatibility with jmobile 2013-04-24 15:49:43 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Regis Houssin
7217d91f13 Fix: missing commit 2013-04-22 15:26:45 +02:00
Regis Houssin
28757c8d88 Fix: missing commit 2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504 Fix: broken features 2013-04-22 15:09:19 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00