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
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +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
Laurent Destailleur
67c1ae8593
Fixed: condition to show menus
2015-01-30 15:47:27 +01:00
phf
aba3ec0612
[CORE] modification de l'affiche du PDF (#new_ask_price).
2015-01-29 12:26:50 +01:00
phf
4408828af4
[CORE] ajouts des conditions pour le fonctionnement avec le module (#new_ask_price).
2015-01-29 12:13: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
phf
3743745cd8
[CORE] maj mineur (#new_ask_price).
2015-01-29 10:44:23 +01:00
phf
a58899d354
[CORE] ajout d'une condition pour le fonctionnement du module (#new_ask_price).
2015-01-29 10:41:08 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
phf
5da4d0262e
[CORE] ajouts des conditions nécessaire pour l'intégration du module (#new_ask_price).
2015-01-28 17:28:44 +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
Christophe Battarel
04f83ae4ff
FIX: always show fournprice select
2015-01-28 16:19:56 +01:00
phf
c5398f61f9
[CORE] Modif de trad et renomage pour le module askpricesupplier (#new_ask_price).
2015-01-28 15:37:52 +01:00
phf
3644f4c84c
[CORE] renomage de masse (#new_ask_price).
2015-01-28 14:48:59 +01:00
phf
a9d26efee8
[CORE] ajout des conditions pour un element de type askpricesupplier (#new_ask_price).
2015-01-28 14:44:48 +01:00
phf
ec621244f3
[CORE] ajouts des conditions spécifiques pour les appels depuis l'objet AskPriceSupplier (#new_ask_price).
2015-01-28 14:34:27 +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
49fa0056c8
[CORE] Avancement des replace (#new_ask_price).
2015-01-27 17:43:07 +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
Maxime Kohlhaas
11dd32a8fd
FIXED Import module was not working with multi-company and importing everything in entity 1
2015-01-26 23:37:25 +01: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
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
