Florian HENRY
|
db2dee7c03
|
syntax
|
2015-02-11 11:48:11 +01:00 |
|
Florian HENRY
|
db94860f76
|
syntax
|
2015-02-11 11:47:12 +01:00 |
|
Florian HENRY
|
73f1d10b72
|
syntax
|
2015-02-11 11:46:29 +01:00 |
|
Florian HENRY
|
7f5e4aa135
|
FIX : bug #1840 Email template modules in HTML are not render correctly
|
2015-02-11 11:44:49 +01:00 |
|
Laurent Destailleur
|
e3885d6d73
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/lib/tax.lib.php
|
2015-02-10 21:36:38 +01:00 |
|
Marcos García de La Fuente
|
530186c59d
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:32:00 +01:00 |
|
Marcos García de La Fuente
|
0d6d98b395
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:17:37 +01:00 |
|
phf
|
2a1a5e74c6
|
[CORE] mise à jour de l'objet pour l'info bulle après modification de l'incoterm (#incoterm).
|
2015-02-10 11:46:09 +01:00 |
|
Marcos García de La Fuente
|
023175b9f1
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:38:13 +01:00 |
|
Marcos García de La Fuente
|
ca939bf8a5
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:02:11 +01:00 |
|
Marcos García de La Fuente
|
e21681a369
|
PHPDoc and misc fixes for Admin
|
2015-02-10 10:52:48 +01:00 |
|
Marcos García de La Fuente
|
157a6e109e
|
Misc Adherents PHPDoc corrections
|
2015-02-10 10:45:48 +01:00 |
|
phf
|
1701ecfd89
|
[CORE] fonction setIncoterms générique pour mettre à jour les valeurs de incotermsdes différentes tables (#incoterm).
|
2015-02-10 10:23:38 +01:00 |
|
phf
|
23751c75dc
|
[CORE] fin de la mise en place de la gestion incoterms des sociétés (#incoterm).
|
2015-02-10 10:22:38 +01:00 |
|
phf
|
62762f82a9
|
[CORE] incorporation de l'ajout / modification de l'incoterm sur un tiers (#incoterm
|
2015-02-09 17:55:43 +01:00 |
|
phf
|
34bc1dbc15
|
Merge branch 'develop' into new_ask_price
|
2015-02-09 09:07:50 +01:00 |
|
Laurent Destailleur
|
90fdc29d5e
|
Fix restore compatibility
|
2015-02-07 17:41:20 +01:00 |
|
Laurent Destailleur
|
a21acdeb7c
|
Enable select2 for users combo
|
2015-02-07 03:41:09 +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
|
35129f2192
|
Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly
supported.
Fix: No limit on ldap search on dolibarr side.
|
2015-02-06 16:33:33 +01:00 |
|
Laurent Destailleur
|
96215ccea5
|
Fix bad operator for and
|
2015-02-03 13:05:28 +01:00 |
|
phf
|
c22bbb23d8
|
[CORE] ré-indentation d'une ligne (#new_ask_price).
|
2015-02-03 10:09:25 +01:00 |
|
Laurent Destailleur
|
7b209fa0be
|
New: Add hidden option PDF_SHOW_PROJECT to show project ref onto
supplier orders and invoices.
|
2015-02-02 18:36:49 +01:00 |
|
phf
|
5266542bc9
|
[CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price).
|
2015-02-02 17:50:33 +01:00 |
|
Laurent Destailleur
|
9c087e27d0
|
Fix permissions
|
2015-02-02 13:45:55 +01:00 |
|
Laurent Destailleur
|
34cbcad9da
|
Reduce number of new to save memory usage.
Fight table to replace with div
|
2015-02-01 00:40:42 +01:00 |
|
Laurent Destailleur
|
9188be57ce
|
Select2 component creates problem of sizing with jmobile.
|
2015-01-31 19:25:26 +01:00 |
|
Laurent Destailleur
|
d66d4f53a5
|
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
frederic34-tooltip
Conflicts:
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/product/index.php
|
2015-01-31 15:41:33 +01:00 |
|
Laurent Destailleur
|
1c7feb67ea
|
Merge branch 'dinamic-prices-product' of
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
|
2015-01-31 14:53:14 +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
|
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
|
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
|
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
|
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
|
49fa0056c8
|
[CORE] Avancement des replace (#new_ask_price).
|
2015-01-27 17:43:07 +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 |
|
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 |
|
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
|
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
|
55b8c28100
|
Corrected weird typo
|
2015-01-18 16:28:42 +01:00 |
|