Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

10032 Commits

Author SHA1 Message Date
Frédéric FRANCE
dc054e56ec Update compta-files.php 2019-02-14 18:10:10 +01:00
Philippe GRAND
ec370e247a update with html5 compliant code 2019-02-14 16:59:24 +01:00
Philippe GRAND
43486828db update with html5 compliant code 2019-02-14 16:56:49 +01:00
Philippe GRAND
a6cc8278c8 update with html5 compliant code 2019-02-14 16:54:53 +01:00
Philippe GRAND
5b2c80b62d update with html5 compliant code 2019-02-14 16:51:09 +01:00
Philippe GRAND
91fca7a1af update with html5 compliant code 2019-02-14 16:48:10 +01:00
Philippe GRAND
2507ff9684 update with html5 compliant code 2019-02-14 16:45:49 +01:00
Philippe GRAND
ed1a59d00b update with html5 compliant code 2019-02-14 16:43:40 +01:00
Philippe GRAND
1f2dd3bc29 update with html5 compliant code 2019-02-14 16:38:03 +01:00
Philippe GRAND
69f350eb0e update with html5 compliant code 2019-02-14 16:33:38 +01:00
ptibogxiv
7f3f166a81 NEW link/delete contact in invoice object 2019-02-14 00:44:40 +01:00
Laurent Destailleur
b9467c10bf Merge pull request #10561 from eoxia-jimmy/develop 
NEW: API Proposal, Orders, Invoices: Add contact details
 2019-02-13 16:39:57 +01:00
Laurent Destailleur
e18ff7d087 Merge pull request #10568 from frederic34/patch-20 
Update facture-rec.class.php
 2019-02-13 16:36:54 +01:00
florian HENRY
dd9896516b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/margin/agentMargins.php
	htdocs/product/stock/movement_card.php
	htdocs/projet/tasks/time.php
	htdocs/resource/class/html.formresource.class.php
 2019-02-13 12:52:07 +01:00
Laurent Destailleur
04e3f23476 Fix phpcs 2019-02-13 11:52:45 +01:00
Laurent Destailleur
5c27ec5d25 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/compta/compta-files.php
 2019-02-13 11:21:20 +01:00
florian HENRY
de87321c15 fix travcis 2019-02-13 10:28:08 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
 2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d fix travis (mosty for dev no conerne by my changes) 2019-02-13 09:21:14 +01:00
Frédéric FRANCE
56bbe41917 Update facture-rec.class.php 2019-02-12 23:54:38 +01:00
Laurent Destailleur
d42bf54436 Fix export zip 2019-02-12 23:12:33 +01:00
Laurent Destailleur
036dc52170 Fix test 2019-02-12 19:55:54 +01:00
Laurent Destailleur
5a2161ad09 Debug export of zip 2019-02-12 19:47:46 +01:00
Laurent Destailleur
666d03f596 Fix multicompany for page to export zip of invoices 2019-02-12 18:15:30 +01:00
Laurent Destailleur
68e6f32320 css 2019-02-12 17:56:03 +01:00
Jimmy L
a172ea00a4 Rest API: Proposal, Orders, Invoices: Add contact details 2019-02-12 17:54:59 +01:00
Laurent Destailleur
3d3aca804f Merge pull request #10554 from grandoc/new_branch_12_02_2019 
update with html5 compliant code
 2019-02-12 16:57:11 +01:00
Alexandre SPANGARO
7e60c3bf84 FIX: In various payment, subledger & accout may be alphanumeric 2019-02-12 16:27:25 +01:00
Philippe GRAND
f7a28328ed update with html5 compliant code 2019-02-12 15:40:16 +01:00
Philippe GRAND
60e503c7d1 update with html5 compliant code 2019-02-12 15:02:54 +01:00
Philippe GRAND
5007ef82c8 update with html5 compliant code 2019-02-12 14:56:38 +01:00
Philippe GRAND
fd6eaf8c3d update with html5 compliant code 2019-02-12 14:53:35 +01:00
Philippe GRAND
66e8380a4a update with html5 compliant code 2019-02-12 14:48:07 +01:00
Philippe GRAND
e10d1eb365 update with html5 compliant code 2019-02-12 14:44:25 +01:00
Philippe GRAND
8a62c9bc5f update with html5 compliant code 2019-02-12 14:40:30 +01:00
Laurent Destailleur
46941d4c20 Merge pull request #10539 from frederic34/patch-17 
Update paiement.php
 2019-02-12 13:43:09 +01:00
Laurent Destailleur
3e1b75e916 Merge pull request #10541 from grandoc/new_branch_10_02_2019 
update with html5 compliant code
 2019-02-12 13:35:27 +01:00
Laurent Destailleur
e054b080a5 Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
6f6a767255 Merge pull request #10520 from aspangaro/develop 
NEW: Add subledger in various payment
 2019-02-12 13:20:58 +01:00
Dan Rusu
57e2971a22 fix code indent 2019-02-11 19:58:01 +02:00
Laurent Destailleur
5c01ec158d Fix regression 2019-02-11 15:40:33 +01:00
Dan Rusu
9ce4b91f5d NEW | make credit note from invoice 
inspired from the action of the button "Make credit note" from UI.

 - load invoice data and lines
 - check invoice type
 - calculate totals and create new credit notes
 - create DiscountAbsolute & commit changes
 2019-02-11 09:31:43 +02:00
Dan Rusu
0698ddbd77 Revert "add API method to create credit note from invoice" 
This reverts commit 288a876491.
 2019-02-11 09:24:16 +02:00
Dan Rusu
288a876491 add API method to create credit note from invoice 2019-02-11 09:14:06 +02:00
Philippe Grand
d589ba4847 Update clientfourn.php 
fixed...
 2019-02-10 19:13:11 +01:00
Philippe GRAND
0911631b47 update with html5 compliant code 2019-02-10 16:31:34 +01:00
Philippe GRAND
0d5726b70a update with html5 compliant code 2019-02-10 16:08:03 +01:00
Philippe GRAND
5d6ebad557 update with html5 compliant code 2019-02-10 16:05:06 +01:00
Philippe GRAND
9670228f06 update with html5 compliant code 2019-02-10 16:00:59 +01:00
Philippe GRAND
d42ef14a92 update with html5 compliant code 2019-02-10 15:59:19 +01:00