Laurent Destailleur
|
0eb966ec83
|
Merge pull request #8282 from aspangaro/8.0-a6_vat
Add information in VAT admin page
|
2018-03-07 12:24:02 +01:00 |
|
Laurent Destailleur
|
f597e08d06
|
Merge branch 'develop' into 8.0-a6_vat
|
2018-03-07 12:23:43 +01:00 |
|
Laurent Destailleur
|
2053cc9307
|
Merge pull request #8284 from hregis/7.0_bug5
Fix: wrong entity id, always value 1 !
|
2018-03-07 12:19:09 +01:00 |
|
Marc de Lima Lucio
|
dd208348c4
|
FIX: add planned delivery to order exports
|
2018-03-07 12:18:08 +01:00 |
|
Laurent Destailleur
|
7e3b118257
|
Standardize output
|
2018-03-07 12:03:40 +01:00 |
|
Laurent Destailleur
|
1ca5c7083a
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2018-03-07 11:54:48 +01:00 |
|
Laurent Destailleur
|
f800d50fec
|
WIP to show event per hours
|
2018-03-07 11:53:30 +01:00 |
|
alexis Algoud
|
cb27eb98e1
|
FIX natural search double quote
|
2018-03-07 11:42:47 +01:00 |
|
Laurent Destailleur
|
a0a9e12178
|
Fix css
|
2018-03-07 11:29:50 +01:00 |
|
Laurent Destailleur
|
1a5cc4e516
|
Fix in edit mode, title of event is required
|
2018-03-07 11:06:14 +01:00 |
|
Laurent Destailleur
|
f3fd5f4cfa
|
FIX Label of event show twice
|
2018-03-07 11:03:35 +01:00 |
|
Laurent Destailleur
|
fab007ad83
|
Remove deprecated option dolibarr_pdf_force_fpdf
Fix view of dolibarr setup config file
|
2018-03-07 09:41:27 +01:00 |
|
florian HENRY
|
6cb77577a6
|
can use image
|
2018-03-07 09:03:13 +01:00 |
|
florian HENRY
|
bb73a715a8
|
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task
|
2018-03-07 08:49:08 +01:00 |
|
florian HENRY
|
03873038d5
|
fix comment task
|
2018-03-07 08:47:34 +01:00 |
|
Laurent Destailleur
|
23a4a60970
|
Fix status of task
|
2018-03-06 21:51:43 +01:00 |
|
ptibogxiv
|
b8f88ea315
|
ADD stock decrement
|
2018-03-06 20:45:05 +01:00 |
|
Laurent Destailleur
|
0dfc9af72a
|
FIX multicompany compatibility and fix reports
|
2018-03-06 19:58:13 +01:00 |
|
Regis Houssin
|
bf4402eb89
|
Fix: missing superadmin
|
2018-03-06 19:22:59 +01:00 |
|
Regis Houssin
|
175971bfc1
|
Fix: syntax error
|
2018-03-06 19:12:18 +01:00 |
|
Regis Houssin
|
d406b28911
|
Fix: problem to see users with transverse mode
|
2018-03-06 19:08:39 +01:00 |
|
ptibogxiv
|
382fe4f13c
|
FIX group account settings
transfert bank settinds to account setting et let only general common online payment settings
|
2018-03-06 16:29:43 +01:00 |
|
ptibogxiv
|
613e92e5e8
|
update stripe php
|
2018-03-06 13:52:56 +01:00 |
|
ptibogxiv
|
f35606e434
|
FIX update stripe php librairy
|
2018-03-06 13:50:42 +01:00 |
|
Regis Houssin
|
1807bb36e2
|
Fix: missing global $conf
|
2018-03-06 13:31:13 +01:00 |
|
ptibogxiv
|
10b16187d4
|
NEW convert rib.php to gateway.php
|
2018-03-06 13:26:40 +01:00 |
|
ptibogxiv
|
5e0327329c
|
NEW convert rib.php to gateways.php
do stripe integration
be conform to PSD2 rules
less tab fo company
|
2018-03-06 13:23:35 +01:00 |
|
Regis Houssin
|
35703cff99
|
Fix: wrong entity id, already value 1 !
|
2018-03-06 13:23:00 +01:00 |
|
ptibogxiv
|
c133b04abf
|
ADD banktransfer account for stripe webhook
|
2018-03-06 13:16:12 +01:00 |
|
Laurent Destailleur
|
592a97f9a5
|
Fix default topic
|
2018-03-06 12:45:48 +01:00 |
|
Laurent Destailleur
|
45fd0cfc16
|
FIX Subscription events not recorded into agenda
|
2018-03-06 12:36:39 +01:00 |
|
Laurent Destailleur
|
72af963ed5
|
Fix triggers
|
2018-03-06 12:26:26 +01:00 |
|
Laurent Destailleur
|
1e6a55745c
|
CSS
|
2018-03-06 11:54:05 +01:00 |
|
Laurent Destailleur
|
a086bd0137
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
|
2018-03-06 09:20:45 +01:00 |
|
Laurent Destailleur
|
17e012e0ac
|
FIX Subscription not correctly log in blockedlog
|
2018-03-06 09:08:45 +01:00 |
|
Laurent Destailleur
|
7c95233e3c
|
FIX Trad and creation date in subscription create
|
2018-03-06 09:08:28 +01:00 |
|
Laurent Destailleur
|
14d7ffa53b
|
Fix cancel and template to record stock movement/correction
|
2018-03-06 09:07:39 +01:00 |
|
Laurent Destailleur
|
6d13e58a23
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-03-06 09:07:03 +01:00 |
|
Laurent Destailleur
|
a765dba570
|
Fix trad
|
2018-03-06 09:06:49 +01:00 |
|
Alexandre SPANGARO
|
4a46ffc5d8
|
Add information in VAT admin page
|
2018-03-06 05:02:09 +01:00 |
|
Laurent Destailleur
|
0cfa19ee09
|
NEW Online payment of invoice and subscription record the payment
automatically.
|
2018-03-06 00:12:23 +01:00 |
|
Laurent Destailleur
|
d569adea2f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-05 21:46:40 +01:00 |
|
Laurent Destailleur
|
2f9f4d0675
|
WIP Create payment of member subscription with paypal
|
2018-03-05 21:46:24 +01:00 |
|
ptibogxiv
|
10ff23e6c4
|
Update charge
|
2018-03-05 21:35:37 +01:00 |
|
ptibogxiv
|
b09e6f3279
|
Update transaction.php
|
2018-03-05 21:35:00 +01:00 |
|
Laurent Destailleur
|
1537363e59
|
Fix cancel and template to record stock movement/correction
|
2018-03-05 21:16:01 +01:00 |
|
Laurent Destailleur
|
5774087544
|
Merge pull request #8280 from atm-alexis/NEW_price_on_stock_mvt
NEW Can see Unit Purchase Value of product in stock movement
|
2018-03-05 20:59:07 +01:00 |
|
Laurent Destailleur
|
c921fde3e5
|
Update mouvement.php
|
2018-03-05 20:58:30 +01:00 |
|
Laurent Destailleur
|
f9f37c52de
|
Merge pull request #8275 from ATM-Nicolas/fix_order_line_fk_multicurrency
Fix order line fk multicurrency
|
2018-03-05 20:50:14 +01:00 |
|
Laurent Destailleur
|
a87d558b41
|
Merge pull request #8274 from defrance/patch-104
Optimise SQL squery
|
2018-03-05 20:50:00 +01:00 |
|