Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 17:31:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,830 Commits 36 Branches 190 Tags
30aea901b8f83d4563c864abb841a3e4f7ce9e83
Commit Graph

9302 Commits

Author SHA1 Message Date
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
frederic34
6d5767e464 Merge remote branch 'upstream/develop' into selectdelivery 2014-07-28 20:15:40 +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
395b003266 Merge remote branch 'upstream/develop' into selectdelivery 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-28 17:10:07 +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
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
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
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +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
frederic34
5258c522ce Some cleaning 2014-07-25 23:20:19 +02:00
frederic34
2df2c12cfd The delivery method is transmited in shipment 2014-07-25 21:50:21 +02:00
Maxime Kohlhaas
2e18fa88d1 Mauvais libellé utilisé pour statut commande 2014-07-25 14:03:41 +02:00
frederic34
f0a7cc3268 Select Shipping Method in Propal 2014-07-24 18:08:08 +02:00
frederic34
5ef626813c Update html.form.class.php 2014-07-23 09:49:58 +02:00
Marcos García de La Fuente
37c7d05a9e Added missing return null for getStaticMember 2014-07-22 04:46:17 +02:00
Marcos García de La Fuente
1a254b310e Merge remote-tracking branch 'upstream/develop' into optimization 
Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-22 04:42:50 +02:00
Marcos García de La Fuente
203dc5518a Merge branch 'develop' into optimization 2014-07-22 04:39:31 +02:00
Marcos García de La Fuente
097e8d33a2 Removed PHP 5.3 comparison in ImportCsv 2014-07-22 04:16:32 +02:00
Marcos García de La Fuente
31adeb7477 Deprecated getStaticMember 2014-07-22 04:12:45 +02:00
Marcos García de La Fuente
9b3e65d80f Removed PHP 5.3 comparison in dol_nl2br function 2014-07-22 04:07:33 +02:00
Laurent Destailleur
0327738aa9 phpcs 2014-07-21 21:07:30 +02:00
Laurent Destailleur
161f5eadd4 Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
Scrutinizer Auto-Fixer
42a4af3b6e Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/dce98b05-0037-4277-b1e9-7fd6405a6cd6

Enabled analysis tools:
 - PHP Analyzer
 2014-07-21 18:42:17 +02:00
Scrutinizer Auto-Fixer
2fdda8cbfb Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/128b4bb3-f689-4974-8fd7-a7b93d012d3f

Enabled analysis tools:
 - PHP Analyzer
 2014-07-20 23:46:38 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
cfc337a79a Qual: Enable php checkstyle rule Zend.Files.ClosingTag 
Fix: Solve a lot of checkstyle errors.
 2014-07-20 15:27:38 +02:00
Laurent Destailleur
bd095f597d Fix: CheckStyle 2014-07-20 14:54:30 +02:00
Laurent Destailleur
ecd99608c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-20 05:14:45 +02:00
Laurent Destailleur
f6b8017386 Fix: PHPCS 2014-07-20 05:14:22 +02:00
Laurent Destailleur
bf926cd791 Merge pull request #1756 from marcosgdf/messages 
Migrated old message notifications to the """new""" system
 2014-07-20 04:57:09 +02:00