lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,762 Commits 43 Branches 150 Tags 886 MiB
8214e7bb42
Commit Graph

64762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rui Strecht
bffe21d058 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-22 14:35:37 +01: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
Neil Orley
9498fca5e1 Add of implementation notes with an exemple 2017-09-22 12:24:42 +02:00
Neil Orley
1aedc4a793 Change the term 'order' by 'invoice' 2017-09-22 12:18:11 +02:00
Neil Orley
ad6778a1cf NEW post lines of an invoice using the REST API 
Adds the ability to post a new lins in an invoice using the REST API
 2017-09-22 12:08:11 +02:00
Neil Orley
f985b1ede6 NEW GET lines of an invoice in the REST API 
Adds the ability to get lines of an invoice using the REST API
 2017-09-22 12:00:54 +02:00
Neil Orley
4cd89abffc Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api 2017-09-22 11:58:37 +02:00
Laurent Destailleur
236cf853e5 Sort list of invoice template 2017-09-22 11:47:36 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00
Rui Strecht
a34a49d1ce Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-22 09:49:38 +01:00
Laurent Destailleur
292095f0c6 NEW Can filter on type of email template 2017-09-22 10:11:51 +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
Laurent Destailleur
9875d20eaf Add more columns in list of invoices templates 2017-09-21 18:35:47 +02:00
David
9dab694bb0 FIX: REST API, date field not used for invoices creation 2017-09-21 17:48:12 +02:00
gauthier
d51c22a012 NEW : customizable meteo in value or percentage 2017-09-21 17:28:00 +02:00
Rui Strecht
72b8a22900 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-21 15:39:25 +01:00
fmarcet
72108c3a4e Fix: #7358 User can't create holiday requests with 'Create/modify your leave requests' rights 2017-09-21 15:59:50 +02:00
fappels
02f6bc7b4f Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-09-21 14:43:10 +02:00
Laurent Destailleur
a3347e83b3 Better error message 2017-09-21 14:04:25 +02:00
Laurent Destailleur
57358f0ce5 NEW Provide a way to download a file from a public URL for files in ECM 2017-09-21 14:02:42 +02:00
Laurent Destailleur
96efe43e3c NEW Provide a way to download a file from a public URL. 2017-09-21 12:48:07 +02:00
florian HENRY
8f19ffd097 Fix contract class for date 2017-09-21 12:22:10 +02:00
Regis Houssin
71fc5a99d6 Fix: list already load in trigger 2017-09-21 12:19:14 +02:00
Regis Houssin
01f9d59e75 Fix: use another method 2017-09-21 12:16:01 +02:00
Ferran Marcet
76c3fe1260 Fix: Stripe not working on live mode 2017-09-21 12:06:43 +02:00
Laurent Destailleur
296e678c1b Solve url too long with paybox 2017-09-21 12:02:46 +02:00
florian HENRY
cafcbe03e1 agin fix list ressource 2017-09-21 12:02:45 +02:00
Laurent Destailleur
cb90ab124b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-21 11:54:49 +02:00
Laurent Destailleur
23604a2b54 NEW Add hidden option PROJECT_DISABLE_UNLINK_FROM_OVERVIEW 2017-09-21 11:54:37 +02:00
Laurent Destailleur
8a06a1f433 Code comment 2017-09-21 11:50:36 +02:00
Laurent Destailleur
dafeb4c651 Merge pull request #6806 from mikee2/develop 
New fields in Segment.php
 2017-09-21 11:42:31 +02:00
Laurent Destailleur
5980651103 Merge branch 'develop' into develop 2017-09-21 11:41:30 +02:00
florian HENRY
5240217144 fix again resource list 2017-09-21 11:36:50 +02:00
Laurent Destailleur
d68abf8237 Merge pull request #7453 from atm-florian/6.0 
fix ressource list
 2017-09-21 11:36:26 +02:00
Laurent Destailleur
e56840b9ec Clean deprecated code 2017-09-21 11:35:18 +02:00
florian HENRY
03ffbe55ce fix ressource list 2017-09-21 11:34:19 +02:00
Laurent Destailleur
d71916af7b Merge pull request #7437 from tysauron/patch-12 
Rename "->fk_action"   in  "->type_id"
 2017-09-21 11:26:38 +02:00
Laurent Destailleur
a918fd1cf2 Merge pull request #7370 from Oeris/6.0-api 
NEW Implementation of a Luracast recommandation for the REST api server
 2017-09-21 11:20:23 +02:00
Laurent Destailleur
ee01ebba0f Merge pull request #7441 from tysauron/patch-13 
For use ajax select company
 2017-09-21 11:19:39 +02:00
Laurent Destailleur
beac7a7439 Work on direct download links 2017-09-20 21:29:27 +02:00
Laurent Destailleur
0eb416d4af Fix removal of a file 2017-09-20 20:41:40 +02:00
Laurent Destailleur
2831f90b42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-20 19:36:33 +02:00
Laurent Destailleur
2f317c5834 Debug online payment using unique form 2017-09-20 19:34:14 +02:00
Laurent Destailleur
21959aec8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-20 17:42:09 +02:00
Laurent Destailleur
81596b503c Merge pull request #7445 from hregis/develop_trad 
Fix: check if array and check empty value if required
 2017-09-20 17:38:00 +02:00
Laurent Destailleur
68c9d08909 Merge pull request #7438 from fappels/6.0_fix_extrafields_copy 
FIX extrafields copy situation invoice, shipment and receipt
 2017-09-20 17:36:48 +02:00
tysauron
e61032a313 Bug get socid with old object sosciete 2017-09-20 17:35:11 +02:00
Laurent Destailleur
1cedd63c4e Merge pull request #7440 from tysauron/patch-14 
Bug get socid with old object sosciete
 2017-09-20 17:34:25 +02:00
Laurent Destailleur
fc5c9ad2f2 Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling 
Fix batch required for lot product error message.
 2017-09-20 17:33:05 +02:00