lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,437 Commits 43 Branches 150 Tags 886 MiB
451c9cab7e
Commit Graph

35437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Maxime Kohlhaas
803bee076c Engish standardization correction + search by idprof1 possible 2013-03-01 18:20:42 +01:00
Laurent Destailleur
3022dff108 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-01 18:14:42 +01:00
Maxime Kohlhaas
881b3bc936 Bug fix on contact list due to name column renamed 2013-03-01 18:11:34 +01:00
Laurent Destailleur
562ea22304 Qual: Better error management 2013-03-01 18:10:19 +01:00
Maxime Kohlhaas
06f6850b5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-03-01 18:07:19 +01:00
Raphaël Doursenaud
72576a26ce Added UTF-8 BOM detection and removal maintenance scripts 2013-03-01 16:55:07 +01:00
Laurent Destailleur
29ccc749ae Merge pull request #703 from GPCsolutions/develop-noutf8bom_main 
Removed UTF-8 BOM
 2013-03-01 07:23:17 -08:00
Raphaël Doursenaud
a6407a3642 Removed UTF-8 BOM from included libraries 2013-03-01 14:17:36 +01:00
Raphaël Doursenaud
e76ffca9ba Removed UTF-8 BOM 2013-03-01 14:11:42 +01:00
Maxime Kohlhaas
90d868934b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-03-01 12:53:35 +01:00
Laurent Destailleur
ac1ff205a4 Merge pull request #700 from FHenry/3.3 
Fix [ bug #736 ]
 2013-03-01 03:49:52 -08:00
Laurent Destailleur
a1b4d670ff Merge pull request #701 from defrance69/patch-14 
Update index.php
 2013-03-01 03:48:54 -08:00
Laurent Destailleur
efa7a617b6 Merge pull request #702 from atm-alexis/develop 
Ajout de la gestion des Hooks sur la page d'ajout des commerciaux
 2013-03-01 03:48:21 -08:00
Alexis Algoud
49f712546f Add condition for normal traitment on empty hook result. 
Note : The normal case on 'formObjectOptions' is currently nothing more (no extrafields,...).
 2013-03-01 11:38:24 +01:00
Alexis Algoud
2d36423310 Ajout de la gestion des Hooks (doActions & sur la page d'ajout des commerciaux à une société, /societe/commerciaux.php 2013-03-01 10:42:05 +01:00
Laurent Destailleur
bf0e4d73d0 Fix launchpad conflicts 2013-03-01 10:04:50 +01:00
Laurent Destailleur
0b51eff562 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-01 09:55:17 +01:00
Laurent Destailleur
5075e9c716 Update to 3.4 2013-03-01 09:55:04 +01:00
Laurent Destailleur
e98b2e2ee1 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-03-01 09:48:16 +01:00
Laurent Destailleur
9106a74426 Fix: Package for launchpad 2013-03-01 09:48:03 +01:00
BENKE Charles
5ad98a8652 Update index.php 
rename search_product by search_project (the real search thing)
 2013-03-01 00:56:29 +01:00
eldy
4e52b2596a Uniformize code 2013-02-28 23:49:38 +01:00