2
0
forked from Wavyzz/dolibarr
Commit Graph

6584 Commits

Author SHA1 Message Date
Grand Philippe
5b5b57d4e0 some fixes for supplier orders extrafields 2013-04-08 23:20:35 +02:00
Laurent Destailleur
826d8a329d Merge pull request #802 from simnandez/develop
Fix: Try to showing the events related to a intervention
2013-04-07 13:54:53 -07:00
Laurent Destailleur
d0d146cabf Translation 2013-04-07 20:15:03 +02:00
simnandez
7b70fc4bf3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-04-07 14:30:44 +02:00
Laurent Destailleur
4e5a71fb22 New: Add local and vat rate for peru 2013-04-06 18:59:22 +02:00
Laurent Destailleur
eaab6d0caa Trans: For peru, IVA is IGV 2013-04-06 18:51:07 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
25ec7eed6d New: Can send email to warn when payment for subscription is payed. 2013-04-06 16:14:28 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/comm/prospect/list.php
2013-04-05 22:59:06 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme.
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
2013-04-03 15:20:56 +02:00
fhenry
be01297403 Fix Ducth (nl_NL) translation 2013-04-03 11:56:54 +02:00
fhenry
735e107a51 Better error management on extrafailed input 2013-04-02 14:12:21 +02:00
fhenry
e93b6141e1 Add translation for extrafield 2013-04-02 12:04:37 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
Laurent Destailleur
cc69cf7b76 New: Can defined a clicktodial setup per user 2013-03-31 16:44:24 +02:00
Laurent Destailleur
294a085047 New: ClickToDial setup is easier 2013-03-31 04:03:08 +02:00
Laurent Destailleur
fa6e9d2d47 Missing trans key 2013-03-30 21:25:37 +01:00
Laurent Destailleur
a5799b3ae8 Trans for SMS 2013-03-30 21:25:00 +01:00
Laurent Destailleur
000fe2c864 New: Better error management for add/remove of memeber into mailman. 2013-03-30 18:04:33 +01:00
Laurent Destailleur
1eec85da9d Merge pull request #791 from grandoc/develop
Develop
2013-03-30 07:58:48 -07:00
Laurent Destailleur
4208f11d87 Enhance fixutf8bomfiles and fixdosfiles tools. 2013-03-30 15:57:54 +01:00
Grand Philippe
ee7490a30a fix : language error 2013-03-30 14:31:10 +01:00
Laurent Destailleur
c75ce97960 Update es_MX 2013-03-30 13:30:44 +01:00
Laurent Destailleur
6702386b8b Some fix into chineese language files 2013-03-29 14:54:07 +01:00
jfefe
1f5987b379 Fix trad & add english 2013-03-27 19:13:50 +01:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
Laurent Destailleur
8c053b2f8d Debug module cron 2013-03-26 21:18:01 +01:00
fhenry
7881502b52 [ task #773 ] Add Project document in GED(ECM) modules 2013-03-25 09:56:07 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
fhenry
1e04ff8bbf Add Cron spanish translation (provided by david@luminososmarmenor.com) 2013-03-23 20:36:32 +01:00
fhenry
d84cd86a50 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Merge Cron module
2013-03-23 20:24:28 +01:00
Laurent Destailleur
d54b0d139d Merge pull request #771 from grandoc/develop
fix error translation
2013-03-23 12:03:43 -07:00
Laurent Destailleur
c3589e9785 Some debug into cron module:
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
2013-03-23 19:23:17 +01:00
Grand Philippe
2c718b740e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-23 19:09:08 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
eldy
90025f9c13 Work on revenue stamp 2013-03-23 13:07:25 +01:00
Grand Philippe
3fc8dffadf Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-23 10:22:13 +01:00
Grand Philippe
ea296d8429 fix error translation 2013-03-22 19:24:26 +01:00
simnandez
e9cbf94e06 Trad: Add es_ES and ca_ES missing translations 2013-03-22 17:31:43 +01:00
Laurent Destailleur
5920bb5ae2 Merge pull request #768 from FHenry/develop_cron
[ task #122 ] Create a scheduled cron module
2013-03-22 07:49:13 -07:00
fhenry
0215031632 [ task #122 ] Create a scheduled cron module 2013-03-22 14:45:20 +01:00
Grand Philippe
07940d719b fix error translation 2013-03-22 13:00:26 +01:00
Laurent Destailleur
4949d74267 New: Add a tab "consumption" on thirdparties to list products
bought/sells.
(i implement list for customer invoices and supplier orders, need
someone to finish work for customer orders and supplier invoices)
2013-03-22 00:02:25 +01:00
Laurent Destailleur
a2763df9e7 Qual: Start to clean the simple accountancy moule. 2013-03-20 21:41:16 +01:00
Laurent Destailleur
a3435ab889 Merge remote-tracking branch 'origin/3.3' into develop 2013-03-20 15:32:32 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop
task #768  &  task #769
2013-03-18 05:02:38 -07:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
eldy
1d09e122c0 Some debug with pgsql 2013-03-17 14:28:57 +01:00