Laurent Destailleur
5cb38ece19
Fix travis errors
2017-05-21 19:37:15 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
4e7353f8a0
Clean code
2017-05-19 13:39:00 +02:00
Laurent Destailleur
88fc7dbc3e
Fix remove warning
2017-05-18 19:24:44 +02:00
Laurent Destailleur
4a46480ef5
Fix preview of PDF contract
2017-05-18 12:40:20 +02:00
Laurent Destailleur
998254d9c6
Finish rewrite and debug of module Stripe.
2017-05-14 16:17:23 +02:00
Laurent Destailleur
57ba598b15
Merge pull request #6771 from aspangaro/6.0-stripe
...
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
6f9e67b1fb
Remove no more used constant
2017-05-13 13:08:25 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
cd72c50356
Merge pull request #6799 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2017-05-11 00:04:12 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
823e5b48e3
Code comment
2017-05-10 18:56:18 +02:00
BENKE Charlie
d570df5089
inverted value between FRST & RECUR
2017-05-10 18:17:28 +02:00
Thomas Raschbacher
70de54e97d
fix project extrafields for ODT
...
for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.
2017-05-10 15:21:53 +02:00
Thomas Raschbacher
267e66abfa
Add more fields to projectcontacts substitution
...
civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not
2017-05-10 08:48:28 +02:00
Laurent Destailleur
cf04e5a6e0
Fix duplicate id
2017-05-09 10:45:49 +02:00
Alexandre SPANGARO
16a41242d3
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-05-08 06:39:14 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Scrutinizer Auto-Fixer
d93552c8c5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-05-05 17:13:29 +00:00
Laurent Destailleur
d60e98a797
No payment information on a supplier proposal by default.
2017-05-05 13:50:14 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
768df56c07
Uniformize name of standard PDF template
2017-05-04 20:16:55 +02:00
Laurent Destailleur
c196e79bf4
Merge branch 'develop' into FIX_inventory
2017-05-04 13:50:53 +02:00
Laurent Destailleur
3871da0324
Merge pull request #6729 from atm-florian/dev_importexport_ressources
...
NEW : Add module resources import/export
2017-05-04 09:43:00 +02:00
alexis Algoud
12e91f1c1b
fix rights inventory only for MAIN_LEVEL_FEATURES = 2
2017-05-02 15:25:30 +02:00
alexis Algoud
6138d197e4
FIX major issues for inventory
...
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Laurent Destailleur
f5bdfc426f
Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview
...
New inventory coreobject listview
2017-04-29 21:31:46 +02:00
Laurent Destailleur
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +02:00
phf
8219ff84c8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-04-28 14:45:04 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
10e2b128d1
Fix warning during install
2017-04-24 05:20:45 +02:00
Laurent Destailleur
65fec95458
Fix debian package
2017-04-24 04:17:59 +02:00
Alexandre SPANGARO
3b626b75c4
Update works
2017-04-22 06:58:44 +02:00
Alexandre SPANGARO
c3fe1c963a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-22 06:33:31 +02:00
Laurent Destailleur
cfc31e91e8
FIX overwrapping of weight/volume on rouget template
2017-04-18 18:13:43 +02:00
florian HENRY
a52db08cd6
NEW : Add module resources import/export
2017-04-18 15:25:04 +02:00
Alexandre SPANGARO
d0e27f67e7
Add plugins Stripe
2017-04-18 05:44:08 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-17 06:51:02 +02:00
Laurent Destailleur
e97e202deb
NEW Can import users
2017-04-17 04:22:53 +02:00
Laurent Destailleur
7354cb148a
Fix scrutinizer
2017-04-15 03:13:17 +02:00
Laurent Destailleur
8c07f514c8
Add php unit tests on expense reports
2017-04-14 16:51:30 +02:00
Laurent Destailleur
c7160ad2b9
Avoid warning
2017-04-14 14:19:21 +02:00
Laurent Destailleur
62394abb8b
Introduce skeleton for a collab module. Volunteer wanted.
2017-04-14 14:11:52 +02:00
Laurent Destailleur
e6e9b65594
NEW Reduce memory usage by removing deprecated constant loading.
2017-04-14 12:38:52 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00