Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
879cfbbdf3 Merge pull request #1080 from defrance69/patch-4
Update modFacture.class.php
2013-07-05 05:59:19 -07:00
Laurent Destailleur
df22c8b8ee Merge pull request #1079 from FHenry/3.4
Reset demo webservice to NORUN
2013-07-05 05:58:12 -07:00
Laurent Destailleur
2cdf621b75 New: Provide relativepath as parameter 2013-07-05 14:55:24 +02:00
BENKE Charles
45e32ca3a5 Update modFacture.class.php
add 'accountancy_code_sell' to the customer invoice export list
2013-07-05 12:14:27 +02:00
Laurent Destailleur
529a58cc9d New: Add advice into info help 2013-07-05 12:04:55 +02:00
Florian Henry
1e089ef74a Reset demo webservice to NORUN 2013-07-05 09:19:56 +02:00
Laurent Destailleur
7cb8809669 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-04 00:12:23 +02:00
Laurent Destailleur
eef039e02f New: [ task #286 ] Enhance rounding function of prices to allow round of
sum instead of sum of rounding
2013-07-04 00:11:40 +02:00
simnandez
c474929caa Trad: Load contracts lang for stats panel 2013-07-03 16:51:06 +02:00
simnandez
df26037e9d Trad: Load contracts lang for stats panel 2013-07-03 16:49:54 +02:00
simnandez
66ce0582a1 Trad: Fix missing = into es_ES admin.lang 2013-07-03 16:42:53 +02:00
Laurent Destailleur
99210a1501 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
Conflicts:
	build/debian/control
2013-07-03 16:29:05 +02:00
Laurent Destailleur
3004b5fdf6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-03 16:12:36 +02:00
Laurent Destailleur
c1abd26a60 Fix: Package name for wheezy 2013-07-03 16:12:17 +02:00
Regis Houssin
7e70d935b6 Fix: change for use url of image 2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb Fix: change for use url of image 2013-07-03 16:06:42 +02:00
Laurent Destailleur
c83e60b471 Merge pull request #1077 from defrance69/patch-3
Update fiche.php
2013-07-03 06:48:20 -07:00
BENKE Charles
94772dbe30 Update fiche.php
change restricted area, too much agressive
2013-07-03 15:25:22 +02:00
simnandez
6180b6c0a6 Fix: Amarok Tab visu. 2013-07-03 12:16:32 +02:00
simnandez
64a04ef150 Trad: Add missing trans before 3.4 final release 2013-07-03 12:14:37 +02:00
Laurent Destailleur
33ed654745 New: Upgrade jquery flot library to 0.8.1 2013-07-03 03:40:59 +02:00
Laurent Destailleur
d96719c948 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-02 21:55:41 +02:00
Laurent Destailleur
6f5a918373 New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page.
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
2013-07-02 21:53:34 +02:00
simnandez
c9fd070bba Fix: Amarok Tab visu. 2013-07-02 18:53:42 +02:00
Laurent Destailleur
b52dd70229 Fix: Missing dependency 2013-07-02 14:21:05 +02:00
Laurent Destailleur
8d7a058a67 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-02 09:59:04 +02:00
Laurent Destailleur
1beb50e870 Fix: State for turkey 2013-07-02 09:58:09 +02:00
Laurent Destailleur
3a8287ba61 Update doc 2013-07-02 01:43:25 +02:00
Laurent Destailleur
46c3b1eb1f Missing vat rate 2013-07-02 01:26:52 +02:00
Laurent Destailleur
cb68924f34 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-07-02 01:10:06 +02:00
Laurent Destailleur
d09e8a522d Fix: PHPunit match previous fix of civility label empty 2013-07-02 01:05:10 +02:00
Laurent Destailleur
c5a7540b37 Update script to update source ref. 2013-07-02 00:21:03 +02:00
Laurent Destailleur
443d6d4405 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-01 22:44:53 +02:00
Laurent Destailleur
fb753cd8ce Fix: Do not send remind to pay invoice for abandonned invoice 2013-07-01 22:36:23 +02:00
Laurent Destailleur
6f047ec1a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-01 22:33:31 +02:00
Laurent Destailleur
ee590d714d Fix: Do not send remind to pay when invoice is closed 2013-07-01 22:01:51 +02:00
Laurent Destailleur
154daa0657 Fix: css 2013-07-01 21:52:09 +02:00
Laurent Destailleur
cf75c7e5ab Merge pull request #1076 from GPCsolutions/3.4-bugfix
Fixed missing class include
2013-07-01 10:36:58 -07:00
Laurent Destailleur
9cb56bbc34 Merge pull request #1075 from csalvador/modcron
Modcron
2013-07-01 10:29:26 -07:00
Raphaël Doursenaud
a4fe6a40bf Fixed missing class include 2013-07-01 17:45:44 +02:00
Cédric Salvador
edc5de4f24 indentation 2013-07-01 15:42:14 +02:00
Cédric Salvador
96cea7b79a add the libname field in the migration script
Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-07-01 15:42:14 +02:00
Cédric Salvador
aa4f2ba8fb made it possible to call a function from a library
Conflicts:
	htdocs/install/mysql/tables/llx_cronjob.sql
	scripts/cron/cron_run_jobs.php
2013-07-01 15:41:27 +02:00
Laurent Destailleur
65c14e9fd9 Add missing turkish file 2013-07-01 14:48:30 +02:00
Laurent Destailleur
b43ba84adb Update tr_Tr language files 2013-07-01 13:57:36 +02:00
Laurent Destailleur
e0742a3439 Fix: Add missing extension (.js, .cml) into script to detect and fix DOS
files.
2013-07-01 13:02:52 +02:00
Laurent Destailleur
4d71761359 Merge pull request #1074 from GPCsolutions/develop
Normalized EOL
2013-07-01 03:47:49 -07:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
17ed70230e Bad request 2013-07-01 11:45:09 +02:00
Laurent Destailleur
56676c925f Merge remote-tracking branch 'origin/3.4' into develop 2013-07-01 02:10:57 +02:00