Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 18:01:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,589 Commits 36 Branches 190 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

9128 Commits

Author SHA1 Message Date
Laurent Destailleur
7cafdc4d9a Fix phpcs 2018-10-18 16:56:43 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Frédéric FRANCE
7d8ff04292 Update paiement.class.php 2018-10-17 08:15:12 +02:00
ptibogxiv
a77458cb36 Update facture.class.php 2018-10-17 00:07:21 +02:00
ptibogxiv
3fdf3c95b4 FIX harmony in date name with API 2018-10-17 00:04:44 +02:00
Frédéric FRANCE
2e77b9fed9 fix phpunit 2018-10-16 22:42:18 +02:00
Laurent Destailleur
8d815c4e6b Merge pull request #9766 from ptibogxiv/patch-73 
ADD support of external modepayment
 2018-10-16 20:30:24 +02:00
Laurent Destailleur
f1c85cb36d Merge pull request #9757 from frederic34/patch-9 
do not trim int
 2018-10-16 19:37:07 +02:00
Laurent Destailleur
97429aeb7a Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
ptibogxiv
d377fc26b4 ADD support of external modepayment 2018-10-16 16:55:25 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Frédéric FRANCE
7492d42ad8 do not trim int 2018-10-15 18:47:12 +02:00
Laurent Destailleur
5d9b770511 phpcs 2018-10-15 13:32:09 +02:00
Laurent Destailleur
df4b3b09d2 Fix var not defined 2018-10-15 13:30:07 +02:00
Laurent Destailleur
abf8867061 Merge pull request #8207 from atm-john/New_invoice_default_documents 
NEW hidden option to define an invoice template for each invoice type
 2018-10-14 16:36:37 +02:00
Maxime Kohlhaas
9be8c579d0 New massaction to generate PDF 2018-10-14 15:50:55 +02:00
Philippe GRAND
d98ebbd9ee Standardize and update code 2018-10-13 10:39:27 +02:00
Laurent Destailleur
a2aa491c51 Merge pull request #9728 from atm-john/8.0_Fix_count_error 
Fix count on no countable object
 2018-10-12 17:52:30 +02:00
Laurent Destailleur
1ab6cd4b59 Update card.php 2018-10-12 17:51:32 +02:00
Laurent Destailleur
99fde00902 Merge pull request #9719 from frederic34/patch-11 
do not trim int
 2018-10-12 17:35:04 +02:00
John BOTELLA
92686100b2 Fix count on no countable object 2018-10-11 10:51:54 +02:00
John BOTELLA
ee225a2b8b FIX situation prev percent 2018-10-11 10:14:22 +02:00
Laurent Destailleur
7f1aa217a6 Fix link 2018-10-10 18:38:53 +02:00
Laurent Destailleur
82e06eda75 FIX save search criteria when going on receipt from bank transaction 2018-10-10 18:33:32 +02:00
Laurent Destailleur
6446343e1b Fix sort lost 2018-10-10 13:05:19 +02:00
Laurent Destailleur
cb29209457 NEW Enhancement in process to make manual bank conciliation 2018-10-10 12:47:18 +02:00
Laurent Destailleur
562ee1cb64 FIX checkbox to conciliate not visible if bank receipt nb known 2018-10-10 12:19:22 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
b73a2a24ef FIX Tooltip on invoice widget 2018-10-10 01:16:53 +02:00
Frédéric FRANCE
03fcc2f088 Update paymentvarious.class.php 2018-10-09 20:31:14 +02:00
Frédéric FRANCE
b917fd0cf2 do not trim int 2018-10-09 19:41:53 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df Merge 2018-10-09 17:06:08 +02:00
Laurent Destailleur
84605bc59b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-09 16:59:47 +02:00
Philippe GRAND
52369bcb2b Standardize and update code 2018-10-09 15:46:10 +02:00
Philippe GRAND
e9bd1be41b Standardize and update code 2018-10-09 15:38:42 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/list.php
 2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
35d5a495de Save pos_source with id of POS station 2018-10-08 22:51:20 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00
Nicolas Aupetit
c26fe00362 fix bank ref override "bordereau cheque" ref 2018-10-09 02:15:38 +11:00
Laurent Destailleur
19cf649b48 Add field to track source module of invoice 2018-10-07 13:59:40 +02:00
Philippe GRAND
83db36f9b2 Standardize code 2018-10-06 12:11:48 +02:00
Nicolas Aupetit
49693854ce Typo fix: "eee" in localtax1 display 2018-10-06 13:51:46 +11:00
Philippe GRAND
94df8d297d Standardize code 2018-10-05 15:44:57 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
Marc de Lima Lucio
82651cd920 FIX: invoice stats: situation invoices were not counted 2018-10-05 12:12:04 +02:00