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

43796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
41ab5a0ce2 Fix: date was not saved if not in future. 2014-07-26 19:02:32 +02:00
Laurent Destailleur
3d56c8ff6a Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ 2014-07-26 18:20:40 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
adb70ecf24 Fix: [ bug #1528 ] Leopard Services numeration module description is not 
translated.
 2014-07-26 17:40:07 +02:00
Laurent Destailleur
f794b820c3 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-26 17:30:41 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
3a0ccdabc9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-26 17:28:22 +02:00
Laurent Destailleur
10e677d2d9 Prepare script for 3.6 version 2014-07-26 17:28:06 +02:00
Laurent Destailleur
45435b597e Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:18:19 +02:00
frederic34
0450498e2b Add restriction to combo box 2014-07-26 17:17:40 +02:00
Laurent Destailleur
78dc958685 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-26 15:07:50 +02:00
Laurent Destailleur
9ef3683acc I grouped rules by Standard (PEAR, Generic, Zend, ...) 
If a standard bring a rule that is duplicate than the other, we must
keep it commented saying duplicate with.
So at any time we know which rule we match for each standard.
 2014-07-26 15:07:30 +02:00
Laurent Destailleur
c5b26fa42a Merge pull request #1769 from frederic34/patch-4 
Update llx_c_shipment_mode.sql
 2014-07-26 14:52:44 +02:00
Laurent Destailleur
234ba0ca1c Merge pull request #1770 from frederic34/patch-5 
Update propal.php
 2014-07-26 14:47:54 +02:00
Laurent Destailleur
2bec2b4bec Merge pull request #1774 from fappels/develop 
Fix on bugfix#1317, clean parameters missing
 2014-07-26 14:19:52 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Laurent Destailleur
8f6023ab5f Fix: phpunit test 2014-07-26 14:07:37 +02:00
Laurent Destailleur
31fb2e9293 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-26 14:05:26 +02:00
Laurent Destailleur
76d4dee411 Merge pull request #1751 from marcosgdf/optimization 
Optimized is_ip dolibarr function
 2014-07-26 14:05:14 +02:00
Laurent Destailleur
4d331aeef5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-26 13:23:40 +02:00
Laurent Destailleur
289a2c6312 Maj readme 2014-07-26 13:23:22 +02:00
frederic34
5258c522ce Some cleaning 2014-07-25 23:20:19 +02:00
Francis Appels
df5d4795bf Fix on bugfix#1317, clean parameters missing 
Clean fk_parent before updating fk_parent
 2014-07-25 22:37:23 +02:00
Laurent Destailleur
5aa4d61afe Merge pull request #1773 from icfr/patch-1 
erreur de frappe
 2014-07-25 22:20:43 +02:00
Laurent Destailleur
f1d8f3cb8e Merge pull request #1768 from mika31/patch-1 
Webservice thirdparty / sale representative
 2014-07-25 22:18:57 +02:00
Laurent Destailleur
f9dc010b3c Merge pull request #1767 from frederic34/patch-1 
Update html.form.class.php
 2014-07-25 22:18:19 +02:00
Laurent Destailleur
7498f38438 Merge pull request #1766 from marcosgdf/changelog 
changelog
 2014-07-25 22:17:55 +02:00
Laurent Destailleur
ed47b27ed9 Merge pull request #1764 from frederic34/patch-3 
Update main.lang
 2014-07-25 22:17:23 +02:00
Laurent Destailleur
5caa7ccd13 Merge pull request #1765 from marcosgdf/patch-3 
Added formConfirm and doAction for supplier invoice card
 2014-07-25 22:17:09 +02:00
Laurent Destailleur
6dddcbfe49 Merge pull request #1763 from frederic34/patch-2 
Update main.lang
 2014-07-25 22:15:30 +02:00
Laurent Destailleur
aa33cc5f42 Merge pull request #1772 from atm-maxime/3.6 
Mauvais libellé utilisé pour statut commande
 2014-07-25 22:14:58 +02:00
frederic34
2df2c12cfd The delivery method is transmited in shipment 2014-07-25 21:50:21 +02:00
icfr
d61d4778fb erreur de frappe 2014-07-25 19:03:31 +02:00
frederic34
4fcff3e2e5 Select delivery method for order 2014-07-25 17:20:42 +02:00
Maxime Kohlhaas
36b634784b Fix : real delivery date on livraison was not displayed 2014-07-25 16:31:41 +02:00
Maxime Kohlhaas
386022947a Categorie class was fetching an object even if no param passed 2014-07-25 14:11:31 +02:00
Maxime Kohlhaas
2e18fa88d1 Mauvais libellé utilisé pour statut commande 2014-07-25 14:03:41 +02:00
Maxime Kohlhaas
393f32097b class fichinterligne was not extending common object => error with trigger call 2014-07-25 13:57:41 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
frederic34
add5328d8f Update propal.php 2014-07-24 18:07:22 +02:00
frederic34
2b3bd260c6 Update llx_c_shipment_mode.sql 2014-07-24 10:26:11 +02:00
frederic34
304e9d2c83 Update llx_c_shipment_mode.sql 
Update GLS tracking url
 2014-07-24 09:45:46 +02:00
Maxime Kohlhaas
948bcaaad7 Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop 2014-07-24 09:03:21 +02:00
Maxime Kohlhaas
108cf11c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-24 09:01:54 +02:00
Maxime Kohlhaas
d2b2f29e4b Start to replace all $conf->entity by getEntity() 2014-07-24 09:01:47 +02:00
mika31
f96f8384e6 Webservice thirdparty / sale representative 
Little patch to add capability to associate (one) sale representative on thirdparty creation.
 2014-07-23 20:23:37 +02:00
Laurent Destailleur
a2760aeacb Typo 2014-07-23 10:26:43 +02:00
frederic34
5239620356 Update main.lang 2014-07-23 10:02:33 +02:00
frederic34
c28c6e578e Update main.lang 2014-07-23 10:00:32 +02:00
frederic34
5ef626813c Update html.form.class.php 2014-07-23 09:49:58 +02:00