jfefe
|
3825b89ead
|
Change companies and product title picto
|
2015-04-18 23:13:48 +02:00 |
|
jfefe
|
c905f88498
|
Change generic and setup image title
|
2015-04-18 23:13:48 +02:00 |
|
Marcos García de La Fuente
|
e2e6049c7f
|
Copyright
|
2015-04-18 20:50:03 +02:00 |
|
Marcos García de La Fuente
|
c07e26dcac
|
Merge branch 'develop' into fr-2613
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-04-18 20:42:57 +02:00 |
|
Marcos García de La Fuente
|
dc790ff586
|
NEW: Feature request: A page to merge two thirdparties into one #2613
|
2015-04-18 20:41:09 +02:00 |
|
jfefe
|
bee5af4d9e
|
Fix : bad usage of empty function with GETPOST
|
2015-04-18 19:56:36 +02:00 |
|
Juanjo Menent
|
c5d8fa4602
|
Fix: solves #2644
|
2015-04-18 19:14:30 +02:00 |
|
philippe grand
|
eaf0fda6aa
|
fix syntax errors
|
2015-04-18 18:07:41 +02:00 |
|
Florian HENRY
|
3d8a7ee179
|
Start email template selector
|
2015-04-18 11:06:53 +02:00 |
|
Laurent Destailleur
|
97cdc55839
|
NEW Module notification should details of emails into confirm box, not
only number.
|
2015-04-13 17:04:18 +02:00 |
|
Laurent Destailleur
|
ae103e34b8
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
|
2015-04-13 13:08:46 +02:00 |
|
Laurent Destailleur
|
1272b03e5e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
|
2015-04-12 12:03:59 +02:00 |
|
Laurent Destailleur
|
56a14da5d4
|
FIXME that are not bug are replaced with TODO
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
|
2015-04-12 04:01:28 +02:00 |
|
Laurent Destailleur
|
1efa5bcabd
|
Fix: Avoid duplicate tooltip
|
2015-04-08 12:44:11 +02:00 |
|
Laurent Destailleur
|
6fa0234409
|
Uniformize code
|
2015-04-07 03:00:11 +02:00 |
|
Scrutinizer Auto-Fixer
|
4da737424e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-04-06 10:25:30 +00:00 |
|
Marcos García de La Fuente
|
611406b75e
|
Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty
|
2015-04-04 17:34:06 +02:00 |
|
Laurent Destailleur
|
d8db32a99c
|
NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
|
2015-04-01 21:00:51 +02:00 |
|
Marcos García de La Fuente
|
cc1d298f29
|
Merge branch 'develop' into constants
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
|
2015-03-30 02:36:46 +02:00 |
|
Laurent Destailleur
|
73b2e0bd01
|
Merge pull request #2471 from marcosgdf/refactor
refactor
|
2015-03-29 16:17:36 +02:00 |
|
Frédéric FRANCE
|
375e0b7e2a
|
PhotoInTooltip for getNomUrl company
|
2015-03-27 08:32:51 +01:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
Laurent Destailleur
|
d678b554e0
|
Fix css
|
2015-03-22 18:39:05 +01:00 |
|
Laurent Destailleur
|
49824a0e56
|
Method colorStringToArray can accept the #
Method monthArray can return short label of month
|
2015-03-22 18:17:25 +01:00 |
|
Laurent Destailleur
|
2d90256640
|
Revert "Refactor 1"
|
2015-03-22 12:51:29 +01:00 |
|
Laurent Destailleur
|
a79a779b04
|
Merge pull request #2456 from marcosgdf/refactor-1
Refactor 1
|
2015-03-22 12:47:05 +01:00 |
|
Laurent Destailleur
|
f44d91e153
|
NEW: The notification module accept keyword __SUPERVISOR__ to send
notification to supervisor of user.
|
2015-03-19 11:47:30 +01:00 |
|
Laurent Destailleur
|
6ceda02eaa
|
NEW: Enhancement of module 'Notification by Email'. Show nb of
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
|
2015-03-18 21:44:57 +01:00 |
|
Laurent Destailleur
|
daf853d040
|
Merge pull request #2455 from aspangaro/develop-ReviewER
QUAL: Traduce terms + remove <center>
|
2015-03-16 02:11:29 +01:00 |
|
Laurent Destailleur
|
79ca1fe147
|
Clean code.
|
2015-03-15 23:32:43 +01:00 |
|
Marcos García de La Fuente
|
086e439543
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
|
2015-03-15 18:16:55 +01:00 |
|
Marcos García de La Fuente
|
2e68b51a10
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-03-15 17:52:07 +01:00 |
|
aspangaro
|
d69f066735
|
QUAL: Traduce terms + remove <center>
|
2015-03-15 14:04:07 +01:00 |
|
Marcos García de La Fuente
|
094538c07b
|
Implemented constants in Commande, Facture and Propal
|
2015-03-15 11:48:57 +01:00 |
|
Laurent Destailleur
|
2a09e34bdf
|
Uniformize etrafields visibility for thirdparties card
|
2015-03-14 13:05:28 +01:00 |
|
Laurent Destailleur
|
687e3d250b
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
dev/fixdosfiles.sh
htdocs/core/tpl/objectline_edit.tpl.php
|
2015-03-13 17:46:31 +01:00 |
|
Laurent Destailleur
|
dfe1ee7e7d
|
Fix: count of notification emails was wrong
|
2015-03-13 14:11:59 +01:00 |
|
Laurent Destailleur
|
59cbde042c
|
Generalize option MAIN_HTML_TITLE for all tabs of thirdparty.
|
2015-03-12 17:29:52 +01:00 |
|
Laurent Destailleur
|
a5645b626c
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
|
2015-03-11 03:55:46 +01:00 |
|
Laurent Destailleur
|
154865f545
|
Fix return error when it is not
|
2015-03-10 16:37:39 +01:00 |
|
Laurent Destailleur
|
0df2b4cc26
|
Fix check parameters
|
2015-03-10 16:14:46 +01:00 |
|
Laurent Destailleur
|
d847f9581e
|
Fix generation of RUM number. Show it on card to help debug.
|
2015-03-10 11:31:23 +01:00 |
|
Laurent Destailleur
|
d119397129
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/societe/class/societe.class.php
|
2015-03-05 11:38:16 +01:00 |
|
Laurent Destailleur
|
dc15eee533
|
Fix: missing dependcy on project to check before deleting
|
2015-03-05 11:21:58 +01:00 |
|
Laurent Destailleur
|
7b7b5090c7
|
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-03-04 23:03:29 +01:00 |
|
Laurent Destailleur
|
96de912661
|
NEW: Add module "Supplier commercial proposals" to requests
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-03-04 17:54:43 +01:00 |
|
Marcos García de La Fuente
|
0170d409d3
|
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2015-03-04 10:16:25 +01:00 |
|
Laurent Destailleur
|
fddbca50b1
|
Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of
tracking id into email.
|
2015-03-03 18:33:53 +01:00 |
|
Laurent Destailleur
|
b888a04af9
|
Reduce a lot of duplicate code. Move all tables of extrafields setup
into a tpl file.
|
2015-02-28 20:14:26 +01:00 |
|
Laurent Destailleur
|
ef14e4e7ed
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
|
2015-02-28 03:11:15 +01:00 |
|