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
jean
5ec0b32ab0
add left joins on llx_c_actiocomm
2015-01-20 17:26:32 +01:00
Laurent Destailleur
f96fdc7d0a
Regression solved
2015-01-18 21:04:39 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
1664b89cef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 19:26:19 +01:00
Laurent Destailleur
9876b30387
Need more info to find bugs
2015-01-17 16:22:37 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
Laurent Destailleur
30abacd0a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527
Merge branch 'develop_bank_extrafields' of
...
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields
Conflicts:
htdocs/admin/bank.php
2015-01-17 14:42:04 +01:00
Laurent Destailleur
6a081fe883
Merge pull request #2229 from frederic34/getnextvalue
...
Translation error messages numbering modules
2015-01-16 12:08:53 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
Laurent Destailleur
ba49cce47a
Fix: The filter into event views on user must be done on assigned
...
resource, not only owner.
2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a
Fixed: Avoid space into address string
2015-01-14 19:17:58 +01:00
Laurent Destailleur
a2c9d5bd4a
Fixed balance of td introduced by MAX_TAB option.
2015-01-14 19:10:21 +01:00
Laurent Destailleur
e10b5637d4
Fixed: Avoid spaces into address string
2015-01-14 18:54:56 +01:00
Laurent Destailleur
a886136e67
More comment and add a unit test to check that {t} tag is correctly
...
supported.
2015-01-13 22:13:15 +01:00
Laurent Destailleur
13132ef2ed
Better organisation of entries into security setup area
2015-01-12 13:20:27 +01:00
frederic34
173d3aaa90
Translation error messages numbering modules
2015-01-11 11:31:53 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
fentman
9049931ff0
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-09 22:55:17 +01:00
