Laurent Destailleur
e8b2b22c32
Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1827
Conflicts:
ChangeLog
2015-02-07 23:56:38 +01:00
Laurent Destailleur
3bdf8864a9
New: Add option MAXTABS_IN_CARD to limit number of visible tabs.
2015-02-07 04:24:31 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
ba5d355eb3
Fix bad property
2015-02-07 02:14:45 +01:00
Laurent Destailleur
553181a5d9
Fixed: Location for file storage from tab attached files was not at same
...
place than from tab images.
2015-02-06 21:26:41 +01:00
Marcos García de La Fuente
b8b9df7b95
Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
2015-02-06 12:36:09 +01:00
Laurent Destailleur
01541e4152
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/core/datepicker.php
2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe
Fix pb into date management.
...
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
Laurent Destailleur
21c78cc392
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-02 21:45:31 +01:00
Raphaël Doursenaud
fb865e8184
FIXED Removed deprecated forcing SSLv3 for CURL
...
Since the Poodle vulnerability, SSLv3 has been supersedded by TLS.
Many services do not offer SSLv3 anymore.
CURL has also been patched in PHP so it now auto-negociates the most appropriate protocol.
This prevented most API calls from working.
2015-02-02 17:13:11 +01:00
phf
38551dd468
[CORE] retrait de liens ou champs inutile (#new_ask_price).
2015-02-02 16:17:07 +01:00
Laurent Destailleur
7fbf76ee2a
Fix phpcs
2015-02-02 15:43:22 +01:00
Laurent Destailleur
7809013b96
Message is more clear.
2015-02-02 13:33:16 +01:00
Laurent Destailleur
3f042fb558
New: Introduce option PROJECT_HIDE_TASKS for people using project only
...
as transversal analytic key and not to manage tasks.
2015-02-02 13:27:55 +01:00
Laurent Destailleur
ece70dbd2c
Merge pull request #2293 from frederic34/patch-4
...
Error message is ErrorCounterMustHaveMoreThan3Digits
2015-01-31 19:44:09 +01:00
Laurent Destailleur
c19ff003ea
Merge pull request #2292 from FHenry/develop_contract_line_extrafileds
...
NEW: contract lines extrafileds
2015-01-31 19:43:37 +01:00
Laurent Destailleur
6976aec04b
Merge pull request #2289 from accett/patch-2
...
Currency symbol in Mexico
2015-01-31 19:40:57 +01:00
Laurent Destailleur
963b9e8583
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 19:37:25 +01:00
Laurent Destailleur
9188be57ce
Select2 component creates problem of sizing with jmobile.
2015-01-31 19:25:26 +01:00
Laurent Destailleur
2788a352cf
Missing lang loading
2015-01-31 19:00:00 +01:00
Laurent Destailleur
13019f1f33
Clean code introduced by last PR.
2015-01-31 17:02:36 +01:00
Laurent Destailleur
1e72d49858
Merge pull request #2286 from accett/patch-1
...
New: Introduce num to text function and use sign before amout for mexico currency
2015-01-31 15:55:16 +01:00
Laurent Destailleur
ce8ad39a8e
Remove test code and restore prod code.
2015-01-31 13:00:51 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
291340a39f
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-30 16:34:18 +01:00
Laurent Destailleur
d6dc495a42
Removed bad print
2015-01-30 16:01:56 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
phf
2f8ceea587
[CORE] renomage de variables pour le module + modification de traductions (#new_ask_price).
2015-01-29 12:12:22 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
phf
a98ce01807
[CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price).
2015-01-28 17:27:26 +01:00
phf
903f739449
[CORE] avancement du mercredi matin (#new_ask_price).
2015-01-28 10:33:15 +01:00
Frédéric FRANCE
a560b582f5
Update functions2.lib.php
2015-01-28 00:02:57 +01:00
phf
aaacca9b13
[CORE] première partie des grosses modifications (#new_ask_price).
2015-01-27 16:53:27 +01:00
Florian HENRY
a510a1ef5c
First step add contract lines extrafields
2015-01-27 12:53:02 +01:00
AcceTT Soluciones Computacionales
608b099934
Currency symbol in Mexico
...
I tried to change the order of the currency symbol in Mexico is before.
2015-01-26 21:38:43 -06:00
accett
62ae75b3bf
Update for Mexico Users
...
Add MXN in the array for countries use the sign currency before. (Mexico does). Add function float2text_moneda to convert the number in the text form for tickets, facture, proposals, etc.
2015-01-26 14:38:02 -06:00
Laurent Destailleur
ffde00de81
Fixed date change was lost when changing event assignement.
2015-01-26 10:31:41 +01:00
Laurent Destailleur
57c84089fe
Introduce warning to remind to do a backup before migration.
...
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
0647c49067
Merge pull request #2274 from aschio/develop
...
New: Added Extrafields for Supplier invoice lines and Supplier order lines
2015-01-25 19:21:03 +01:00
Laurent Destailleur
3ebaaa38d2
Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC
2015-01-25 16:04:37 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
Laurent Destailleur
a4990a58b1
The badge was missing for shipment
2015-01-23 18:39:40 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
Laurent Destailleur
0f7238937a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/commande/fiche.php
2015-01-22 18:55:26 +01:00
cla
6dfd5b1fac
Added extrafields features for Supplier Invoice Line and Supplier Order Line
2015-01-22 14:15:34 +01:00
Laurent Destailleur
31be2563c2
Fixed: Allow external module a chance to fix regression.
2015-01-22 12:29:55 +01:00
jean
b809f0aeb8
Merge remote-tracking branch 'origin/3.6' into 3.6
2015-01-20 17:31:17 +01:00
