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
phf
6fee87ca56
[CORE] ajout en commentaire de la requete sql de creation de table (#new_ask_price).
2015-01-26 17:35:37 +01:00
phf
60be0193b0
[CORE] Initialisation global du module askpricesupplier (#new_ask_price).
2015-01-26 17:21:35 +01:00
Laurent Destailleur
ffde00de81
Fixed date change was lost when changing event assignement.
2015-01-26 10:31:41 +01:00
Laurent Destailleur
da9f13bca9
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-25 22:30:05 +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
dfc0ab7bfb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-25 22:00:59 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +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
b926a77325
Merge pull request #2280 from aspangaro/3.7-Accountancy
...
FIXED Accounting module - Align integrate core version & module version 3.6
2015-01-25 17:53:17 +01:00
Laurent Destailleur
3ebaaa38d2
Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC
2015-01-25 16:04:37 +01:00
aspangaro
ae11ab12f6
FIXED Accounting module - Align core & module 3.6
2015-01-25 06:54:17 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
Laurent Destailleur
568d5cb5ba
Fixed: Tracking number restored on PDF shipments
...
Fixed: Translation
Conflicts:
htdocs/langs/en_US/agenda.lang
2015-01-23 18:47:47 +01:00
Laurent Destailleur
a4990a58b1
The badge was missing for shipment
2015-01-23 18:39:40 +01:00
Laurent Destailleur
083cf06908
Fixed: Tracking number restored on PDF shipments
...
Fixed: Translation
2015-01-23 18:33:33 +01:00
frederic34
925aa2039b
Tooltip and cache for boxes
2015-01-23 10:51:12 +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
4bb86717cf
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-22 12:30:18 +01:00
Laurent Destailleur
31be2563c2
Fixed: Allow external module a chance to fix regression.
2015-01-22 12:29:55 +01:00
frederic34
12c8d4ba1f
Merge remote branch 'upstream/develop' into tooltip
2015-01-22 00:44:50 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Frédéric FRANCE
3ab6ac601e
Type of supplier invoice was broken
2015-01-20 17:55:20 +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
e14684c417
Merge pull request #2259 from marcosgdf/misc-fixes
...
misc-fixes
2015-01-19 15:28:28 +01:00
Florian HENRY
ab50437331
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/html.form.class.php
2015-01-19 09:38:00 +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
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
c667f8734a
[ task #1793 ] Create new permission to restrict commercial agent margin to logged user
2015-01-18 16:42:11 +01:00
Marcos García de La Fuente
55b8c28100
Corrected weird typo
2015-01-18 16:28:42 +01:00
Florian HENRY
b171975d18
Fix travis
2015-01-18 16:08:10 +01:00
Florian HENRY
22c253cfc1
add extrafield type, check box from table
2015-01-18 16:02:31 +01:00
Laurent Destailleur
7b7b8f376f
Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1784
Conflicts:
ChangeLog
2015-01-18 15:13:26 +01:00
Laurent Destailleur
d1e2ab6f56
Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1783
Conflicts:
ChangeLog
2015-01-18 15:10:30 +01:00
Laurent Destailleur
c35de1aa06
Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1803
Conflicts:
ChangeLog
2015-01-18 15:01:18 +01:00
Laurent Destailleur
3db231cea6
Merge pull request #2232 from defrance69/patch-43
...
Update commondocgenerator.class.php
2015-01-18 13:45:50 +01:00
Laurent Destailleur
34fe87536b
Merge pull request #2137 from frederic34/printipp
...
Printing System which may accept modules
2015-01-18 13:09:41 +01:00
Laurent Destailleur
b1f889e1d1
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-01-18 12:46:23 +01:00
Frédéric FRANCE
f3a3136452
Update html.form.class.php
2015-01-18 11:38:45 +01:00
Marcos García de La Fuente
71e5cf07c6
Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes
2015-01-18 03:12:46 +01:00
Marcos García de La Fuente
78905c6af1
Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas
2015-01-17 20:29:51 +01:00
Marcos García de La Fuente
dacec491ff
Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON
2015-01-17 19:37:49 +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
Marcos García de La Fuente
068045f6a0
Fix: [ bug #1803 ] AJAX company contact input is not aligned
2015-01-17 18:23:20 +01:00
