Marcos García de La Fuente
09a094104c
Removed duplicated and unused translation key
2014-12-25 18:31:24 +01:00
Laurent Destailleur
bd7f6339ce
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-25 12:08:35 +01:00
Marcos García de La Fuente
743867b91b
Spanish translation
2014-12-23 15:57:30 +01:00
Marcos García de La Fuente
78307a748d
Corrected confusing table header in task list
2014-12-23 15:56:29 +01:00
Laurent Destailleur
9e2f57007b
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-23 12:59:54 +01:00
Laurent Destailleur
acf7b9f130
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-23 12:59:34 +01:00
Frédéric FRANCE
748bef6134
Translation error
2014-12-22 20:02:53 +01:00
frederic34
3bf63ed0a9
Merge remote branch 'upstream/develop' into printipp
2014-12-21 14:59:37 +01:00
Frédéric FRANCE
82d403c347
Update admin.lang
2014-12-21 10:39:54 +01:00
Laurent Destailleur
219cd0f855
Fixed: Translation
2014-12-20 15:52:50 +01:00
Laurent Destailleur
cea500ef80
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
2014-12-20 13:06:08 +01:00
Laurent Destailleur
854ed90a62
Fixed: bad place for the ajaxcombo.
2014-12-20 11:15:10 +01:00
Juanjo Menent
57918fe4f6
Trad: Update es_ES from transifex
2014-12-18 23:02:21 +01:00
Juanjo Menent
d16023a6b7
Trad: Update es_ES from transifex
2014-12-18 22:59:45 +01:00
Juanjo Menent
229e87adc1
Trad: Update es_ES from transifex
2014-12-18 22:35:59 +01:00
Laurent Destailleur
4769e26d8e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
d98f36bd8f
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-17 01:56:52 +01:00
Laurent Destailleur
849628f020
Fix: Typo and translation
2014-12-17 01:56:36 +01:00
Laurent Destailleur
81437d8277
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-16 01:56:44 +01:00
Laurent Destailleur
1850ebe33a
VAT setup for canada was rong
2014-12-16 01:41:49 +01:00
Laurent Destailleur
a8c6417604
Merge remote-tracking branch 'origin/3.7' into develop
2014-12-15 10:33:14 +01:00
Laurent Destailleur
d2398dd1b1
Sync from transifex
2014-12-15 10:31:40 +01:00
Laurent Destailleur
bd34f4e247
Fixed: Typo
2014-12-14 22:26:58 +01:00
Laurent Destailleur
0b6ff8f9bc
Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not
...
be finished. We keep it as development status.
2014-12-14 20:41:11 +01:00
Laurent Destailleur
8a6f7df186
Merge remote-tracking branch 'origin/3.7' into develop
2014-12-14 12:37:20 +01:00
Laurent Destailleur
fae1cd1d21
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-14 12:36:27 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
da3bc3868d
Fixed: Duplicated lang key
2014-12-14 11:46:21 +01:00
Juanjo Menent
64507c3af1
Trad: Update es_ES from transifex
2014-12-13 01:30:39 +01:00
Juanjo Menent
3ee2ced22a
Trad: Update es_ES from transifex
2014-12-13 01:28:23 +01:00
Laurent Destailleur
627e344c78
Documentation of external link.
2014-12-11 14:43:14 +01:00
Laurent Destailleur
036914756b
Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly supported
2014-12-11 14:15:40 +01:00
Laurent Destailleur
63f2bfed24
Fixed: Maxi debug of withdrawal module.
2014-12-09 11:19:16 +01:00
Laurent Destailleur
5f8919c857
Update translation
2014-12-08 23:59:33 +01:00
frederic34
16d860b3f7
Lang Correction
2014-12-08 22:17:28 +01:00
frederic34
715d0f18db
Lang correction
2014-12-08 21:52:53 +01:00
frederic34
295fe115ab
Merge remote branch 'upstream/develop' into printipp
2014-12-08 20:33:50 +01:00
frederic34
be60c13de6
WIP Printing System
2014-12-08 20:33:26 +01:00
Laurent Destailleur
d7dd496239
Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5
2014-12-08 00:09:01 +01:00
Laurent Destailleur
6ddae270b9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-07 23:52:02 +01:00
Laurent Destailleur
634a9d8402
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2014-12-07 19:19:48 +01:00
Laurent Destailleur
455a2fe07a
Fixed: Missing hook init
...
Fixed: Translation at wrong place
2014-12-07 15:14:24 +01:00
Laurent Destailleur
3186a8c23f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-07 12:07:53 +01:00
Juanjo Menent
c655af6135
Trad: Create es_ES productbatch from transifex
2014-12-06 11:06:34 +01:00
Juanjo Menent
0d9aa452b8
Trad: Create es_ES productbatch from transifex
2014-12-06 11:01:15 +01:00
Juanjo Menent
6720d3d706
Trad: Update es_ES from transifex
2014-12-06 01:27:11 +01:00
Juanjo Menent
dc2bd10cec
Trad: Update es_ES from transifex
2014-12-06 01:25:52 +01:00
Florian HENRY
99f817b69a
- New: Add Option to not change date on cloning project
2014-12-05 21:40:55 +01:00
Laurent Destailleur
344aa40858
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
dev/codesniffer/ruleset.xml
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 20:21:40 +01:00
Laurent Destailleur
a9338a0f9f
Fix: Maxi debug of module productbatch.
...
Conflicts:
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 16:04:37 +01:00
