Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

47fce167

Commit 47fce167 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'develop' of https://github.com/FHenry/dolibarr into

FHenry-develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql

parents 793e6e2a 71d0024b

Branches

Tags

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

htdocs/accountancy/bookkeeping/list.php 27 additions, 2 deletions

htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/class/bookkeeping.class.php 30 additions, 0 deletions

htdocs/accountancy/class/bookkeeping.class.php
htdocs/accountancy/class/html.formventilation.class.php 1 addition, 1 deletion

htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/customer/list.php 11 additions, 5 deletions

htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php 40 additions, 74 deletions

htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php 2 additions, 2 deletions

htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/supplier/list.php 2 additions, 2 deletions

htdocs/accountancy/supplier/list.php
htdocs/core/lib/report.lib.php 8 additions, 4 deletions

htdocs/core/lib/report.lib.php
htdocs/install/mysql/migration/3.8.0-3.9.0.sql 5 additions, 7 deletions

htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql 1 addition, 1 deletion

htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql

with 127 additions and 98 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment