Laurent Destailleur
a4b152ff1b
Fix get lines of contracts done in one request instead of 2
2017-10-23 13:28:45 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Laurent Destailleur
f7556e7ad2
FIX make of link to other object during creation
2017-10-19 19:06:48 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Laurent Destailleur
45ac8367bd
NEW Add API for contracts
2017-10-16 17:56:59 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
c771ce524f
Fix lose filter
2017-10-07 18:25:04 +02:00
Laurent Destailleur
5d24aa4830
Fix sql
2017-10-07 14:54:31 +02:00
Laurent Destailleur
ad57a8480f
Merge pull request #7462 from tysauron/patch-15
...
NEW Adding Field "First date of expire" + filter on contract list
2017-10-07 14:16:31 +02:00
Laurent Destailleur
6271c90904
Update list.php
2017-10-07 14:15:47 +02:00
Laurent Destailleur
b91667e69c
Merge pull request #7579 from OPEN-DSI/fix_0003
...
New add test dates order for start and end dates of a line of a contract
2017-10-07 13:16:53 +02:00
Laurent Destailleur
d1ad6e0263
Update card.php
2017-10-07 13:16:39 +02:00
KHELIFA
dadd3842a0
Fix concat desc of lines when create contract from proposal or other
2017-10-06 18:01:03 +02:00
KHELIFA
e715a680bf
New add test dates order for start and end dates of a line of a contract
2017-10-06 17:58:15 +02:00
Laurent Destailleur
9d6498f2a4
NEW Search filters in lists are restored when using "back to list"
2017-10-03 14:50:52 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
florian HENRY
eacb221ffe
fix : add missing column into service's contract lines
2017-09-26 15:15:39 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
4b92e2a705
Fix localtax
2017-09-24 23:55:44 +02:00
Laurent Destailleur
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
Laurent Destailleur
6d7db96359
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 16:31:05 +02:00
Laurent Destailleur
d4bde2a4ea
Fix date substitution for contracts
2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
tysauron
e6e3e8ca68
Adding Field "First date of expire" + filter
...
Ajout d'une colonnes "1er date de fin" avec filtre par mois année et choix "<" ou ">"
Le filtre exclue toutes les lignes fermé.
Permet de voir les contrat a renouvelé prochainement
Présélection du mois encours.
2017-09-22 02:43:42 +02:00
florian HENRY
8f19ffd097
Fix contract class for date
2017-09-21 12:22:10 +02:00
Laurent Destailleur
04e1458a3f
Fix clean parameters
2017-09-19 22:03:44 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
Laurent Destailleur
0536d6cbed
FIX #7330
2017-09-18 15:46:17 +02:00
Laurent Destailleur
aea7318fae
Fix search on ref customer
2017-09-18 00:07:00 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
961d475a9d
More complete substitution system.
...
Add __CONTRACT_NEXT_EXPIRATION_DATE__ and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
2017-09-16 03:45:29 +02:00
Laurent Destailleur
a4086b52ef
NEW Can send email from contract card
2017-09-16 01:34:15 +02:00
Laurent Destailleur
56460f877e
Merge pull request #7404 from atm-florian/dev_add_search_on_extrafield_contractline
...
Add search on extrafields on contract service list
2017-09-15 15:58:30 +02:00
Laurent Destailleur
3dbf4cf176
Update services.php
2017-09-15 15:58:02 +02:00
Laurent Destailleur
3c7c53f321
Update services.php
2017-09-15 15:55:43 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
florian HENRY
db319803ec
add sreach on extrafeilds on contract service list
2017-09-15 12:17:18 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
c8cb66d227
Missing translation
2017-09-11 02:54:06 +02:00
