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

42742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
dcb507fd37 Presentation invoice page 2014-07-29 06:55:28 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2014-07-29 01:17:00 +02:00
Laurent Destailleur
c9d27383a4 Fix: When option to use optimize display for text borwser and blin 
person is on, box addon was broken.
 2014-07-29 00:50:57 +02:00
Juanjo Menent
2783ec7dc8 New: Add PYME (base) accountancy spanish plan 2014-07-29 00:00:34 +02:00
Juanjo Menent
09af3e1efe New: Add PYME (base) accountancy spanish plan 2014-07-28 23:22:50 +02:00
Laurent Destailleur
1f936ef584 Better text to describe reason of option 2014-07-28 21:43:06 +02:00
Laurent Destailleur
096a61d5c0 Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong 
translate.
 2014-07-28 20:35:32 +02:00
Laurent Destailleur
21c7972f7e Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 20:34:51 +02:00
Laurent Destailleur
6d7b50d5d4 Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 20:34:42 +02:00
Laurent Destailleur
1a96bc0f30 Fix: Bad url for cron 
Fix: must use html syntax, not xml
 2014-07-28 20:33:37 +02:00
Laurent Destailleur
bcd441cc1e Fix: Bad url for cron 
Fix: must use html syntax, not xml
 2014-07-28 20:30:31 +02:00
Laurent Destailleur
c20256f702 Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong 
translate.
 2014-07-28 20:12:01 +02:00
Laurent Destailleur
910eeee4b8 Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 20:00:46 +02:00
Laurent Destailleur
f8b6b004cd Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 19:58:29 +02:00
Laurent Destailleur
3011ecf6df Fix: PHPCS 2014-07-28 19:55:12 +02:00
Laurent Destailleur
827bf4b22a Merge pull request #1778 from frederic34/patch-2 
Update html.form.class.php
 2014-07-28 19:48:16 +02:00
Laurent Destailleur
00d8e65629 Merge pull request #1776 from open-minds/develop 
Fix translations in e-mail forms
 2014-07-28 19:46:53 +02:00
Laurent Destailleur
92160b167b Merge pull request #1775 from frederic34/patch-1 
Update box_activity.php
 2014-07-28 19:43:52 +02:00
frederic34
36c5b2d69c Update html.form.class.php 
By example, avoid to have html code in customer name
 2014-07-28 14:04:55 +02:00
Laurent Léonard
0228cd9db7 Fix translations in e-mail forms 2014-07-28 02:45:58 +02:00
Laurent Destailleur
b31bf68376 New: Start to work on data check for dictionnary tables. 2014-07-28 00:47:27 +02:00
Laurent Destailleur
0ca72dcfea Fix: Restore compatibility with old modules. 2014-07-27 23:53:46 +02:00
Laurent Destailleur
355ec7fd27 Fix: Avoid pgsql error of duplicate record making rollback. 2014-07-27 23:52:42 +02:00
Laurent Destailleur
25d18f225f Fix: Restore compatibility with old modules. 2014-07-27 23:51:58 +02:00
Laurent Destailleur
9e91baca36 Fix: Log must be done before query. 2014-07-27 23:23:29 +02:00
Laurent Destailleur
bf9313dd87 getBrowserInfo can return type of layout (classic/phone/tablet) 2014-07-27 20:56:26 +02:00
Laurent Destailleur
709bf20deb Work on prootype for using datatable. 2014-07-27 20:31:11 +02:00
Laurent Destailleur
9681b9abad No need to close php 2014-07-27 14:14:34 +02:00
Laurent Destailleur
b964f9e9e3 New: Add info page about browser. 
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
 2014-07-27 14:13:25 +02:00
frederic34
a771f34c96 Update box_activity.php 
$totalnb is not an amount
 2014-07-27 11:27:33 +02:00
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
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