Commit Graph

35459 Commits

Author SHA1 Message Date
Laurent Destailleur
d92fd0eaed New: Add table, dictionnary and option to enable "revenue stamp". 2013-03-06 16:09:00 +01:00
Laurent Destailleur
0bfa968a3f New: Add field to store revenue stamp 2013-03-06 15:44:06 +01:00
Laurent Destailleur
b56723d600 Fix: Avoid wrapping 2013-03-06 10:06:54 +01:00
Laurent Destailleur
9bced140e6 More explanation onto the php session parameter. 2013-03-06 00:45:43 +01:00
Laurent Destailleur
c37e873ab4 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
2013-03-05 18:32:01 +01:00
Laurent Destailleur
faf1f440e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-05 15:51:57 +01:00
Laurent Destailleur
c11f7dfc71 Next step for rewriting menu managers. 2013-03-05 15:42:26 +01:00
Laurent Destailleur
52c0044fca Merge pull request #713 from atm-maxime/develop
LDAP2Dolibarr sync script final
2013-03-05 05:09:24 -08:00
Maxime Kohlhaas
b2c09e9be4 LDAP2Dolibarr sync script final. Now with scripts sync users and sync groups, all groups and users from LDAP are synced in Dolibarr. To be tested and improved on another LDAP than Active Directory 2013-03-05 13:39:14 +01:00
Laurent Destailleur
de6d40237d Fix: No syntax error when when want no limit 2013-03-05 13:28:31 +01:00
Laurent Destailleur
ae2355fda5 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-03-05 12:54:37 +01:00
Laurent Destailleur
215731dc59 Fix bug 2013-03-05 00:14:04 +01:00
Laurent Destailleur
b036120c70 Labels 2013-03-04 23:56:17 +01:00
Laurent Destailleur
555b3a1199 Fix:; Removed warning 2013-03-04 21:00:22 +01:00
Laurent Destailleur
f86cad0580 Fix: Try a fix for IE9 (need to be tested with IE 8, 7 and 10) 2013-03-04 17:36:20 +01:00
Laurent Destailleur
9a9c9b1083 Merge pull request #711 from FHenry/develop
[ task #743 ] GED : Add aministration option to disabled autotree to
2013-03-04 08:11:54 -08:00
Laurent Destailleur
c0d2ee19f5 Merge pull request #712 from FHenry/3.3
Fix [ bug #747 ]
2013-03-04 08:02:58 -08:00
fhenry
c29602382d Taking account remark on pull request da17302 2013-03-04 16:59:39 +01:00
fhenry
f793ed83f6 Fix [ bug #747 ] 2013-03-04 15:36:40 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to
display
2013-03-04 11:16:46 +01:00
Laurent Destailleur
ae1e0dff87 Merge pull request #710 from FHenry/3.3
Fix [ bug #742 ]
2013-03-03 15:26:50 -08:00
Laurent Destailleur
451c9cab7e Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/prospect/fiche.php
	htdocs/filefunc.inc.php
	htdocs/fourn/commande/fiche.php
2013-03-04 00:16:41 +01:00
Laurent Destailleur
e51c72f1e8 Merge 2013-03-04 00:10:09 +01:00
Laurent Destailleur
931b556b69 Fix: sql error 2013-03-04 00:01:38 +01:00
fhenry
b0212fc8e6 Fix [ bug #742 ]
and translation of constant description
2013-03-03 21:23:18 +01:00
Laurent Destailleur
737752e36c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2013-03-03 00:10:36 +01:00
Laurent Destailleur
248c75a7b2 Look: Minor fix 2013-03-03 00:00:38 +01:00
Laurent Destailleur
fc64b42931 Merge pull request #709 from simnandez/develop
[ task #731 ] Uniformize ref generation. Contracts
2013-03-02 09:44:48 -08:00
simnandez
a811121daf [ task #731 ] Uniformize ref generation 2013-03-02 16:50:36 +01:00
Laurent Destailleur
fc46a02573 Fix: Uniformize field type 2013-03-02 16:39:26 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
6f51925c7b Merge pull request #708 from simnandez/develop
[ task #731 ] Uniformize ref generation. Propals
2013-03-02 07:06:53 -08:00
Laurent Destailleur
0f576181be Merge pull request #707 from simnandez/3.3
Fix: Localtax2 for Spain must be based into buyer
2013-03-02 07:05:50 -08:00
Laurent Destailleur
862c56a118 Merge pull request #704 from GPCsolutions/develop-noutf8bom_includes
Removed UTF-8 BOM from included libraries
2013-03-02 07:05:13 -08:00
Laurent Destailleur
6b3b2ea1c7 Merge pull request #706 from atm-maxime/develop
Bug on contact list
2013-03-02 07:04:41 -08:00
Laurent Destailleur
4a5f2e62e7 Update doc 2013-03-02 16:03:24 +01:00
Laurent Destailleur
519e5dfd48 Merge pull request #705 from GPCsolutions/develop-noutf8bomscripts
Added UTF-8 BOM detection and removal maintenance scripts
2013-03-02 07:02:22 -08:00
Laurent Destailleur
81a06507fa Fix: data not refreshed 2013-03-02 16:01:46 +01:00
simnandez
7d9d575e40 [ task #731 ] Uniformize ref generation. Propals 2013-03-02 15:57:26 +01:00
Laurent Destailleur
f172c900c7 Qual: Uniformize menu code 2013-03-02 14:43:36 +01:00
Laurent Destailleur
eff675793d Qual: Show skeletons to add phpunit for webservices 2013-03-01 23:51:36 +01:00
Laurent Destailleur
f464b7b37c Fix: Avoid using date_format 2013-03-01 23:30:07 +01:00
Laurent Destailleur
5fb4ec7891 Fix: bad field name 2013-03-01 23:14:28 +01:00
simnandez
b16b8f9ff3 Update ChangeLog for 3.3.1 2013-03-01 22:13:38 +01:00
simnandez
b2763bab15 Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:38:08 +01:00
simnandez
0cb5b3f50c Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:32:49 +01:00
Laurent Destailleur
e6afcd328c Look: Minor fix in CSS for IE. 2013-03-01 19:39:54 +01:00
Laurent Destailleur
911c25c3fd Qual: Better error management 2013-03-01 19:25:49 +01:00
Maxime Kohlhaas
da87828200 Fix bug # 740 : address copy 2013-03-01 18:41:41 +01:00