Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 17:42:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,208 Commits 37 Branches 191 Tags
1be1ee16709c7ff16ea99868c8e2e32636d760e0
Commit Graph

8470 Commits

Author SHA1 Message Date
Laurent Destailleur
3f078203b9 Fix phpcs 2019-02-24 20:29:01 +01:00
ptibogxiv
d7ffcca59b FIX fetch module / pos source 2019-02-23 16:00:07 +01:00
Laurent Destailleur
9ba6e3f8f5 FIX #10638 2019-02-23 15:57:57 +01:00
Cristian Torres
8ca6935f8b [FIX] Variable $i is already declared 
It was preventing displaying of the other accounts
 2019-02-23 14:08:11 +01:00
Laurent Destailleur
07d1559802 FIX Mark credit note as available for credit note in other currency 2019-02-18 18:27:06 +01:00
Laurent Destailleur
b2ec340a48 FIX Show button POS Ticket only if invoice was generated by POS 2019-02-18 17:04:53 +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
Regis Houssin
8860eab6b1 FIX wrong merged conflict 2019-02-05 07:40:50 +01:00
Laurent Destailleur
efe5cd3dd8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 21:13:06 +01:00
Laurent Destailleur
cdfeeafab9 FIX #10381 2019-02-03 21:12:05 +01:00
Laurent Destailleur
01f1f6162f Fix phpcs 2019-01-30 20:06:21 +01:00
Laurent Destailleur
f67937c59d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 18:54:29 +01:00
Laurent Destailleur
ae1c4e065b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-30 18:53:56 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5 Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
Pierre Ardoin
30548d977f Prise en charge des Travaux supplémentaires 
Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.
 2019-01-29 11:19:11 +01:00
John BOTELLA
6f12cdf236 Fix travis 2019-01-28 11:58:16 +01:00
John BOTELLA
5dbc9ddae0 fix travis 2019-01-28 11:56:20 +01:00
Laurent Destailleur
f7bcd1ef6d Fix trans 2019-01-28 01:35:12 +01:00
Laurent Destailleur
ba87284a90 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-26 14:30:44 +01:00
John BOTELLA
624d17c96a Fix missing no trigger arg 2019-01-23 17:32:49 +01:00
John BOTELLA
1c51716997 Fix missing trigger 2019-01-23 17:02:20 +01:00
gauthier
84e1f92acd FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc; 2019-01-23 15:16:51 +01:00
Frédéric FRANCE
4ab19c25c8 add missing global $conf in bonprelevement class 2019-01-21 08:23:31 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
16bb85b7fa Merge pull request #10348 from a-schild/9.0 
Fix for issue #10333 branch 9.0
 2019-01-17 18:58:49 +01:00
Laurent Destailleur
f8973c9a22 Fix translation Late <> Alert 2019-01-16 17:44:39 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2019-01-16 16:48:21 +01:00
a-schild
7e3bfd332e Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:07:00 +01:00
a-schild
7df86cb630 Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:06:12 +01:00
a-schild
2f5db98a5c Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:05:22 +01:00
atm-quentin
0d384eea00 FIX credit note can have negative value 2019-01-16 09:33:24 +01:00
Laurent Destailleur
d1e062cafa FIX When changing date of payment, change also record in bank if not 
conciliated yet.
 2019-01-09 13:28:12 +01:00
Laurent Destailleur
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
diversity-co-uk
2dc87509ff Fix Invoice PUT, remove extra parameter 
The first parameter is expected to be the user.
The $id of the invoice is already contained in $this

See facture.class.php 1610:
function update(User $user, $notrigger=0)
 2019-01-08 14:17:33 +01:00
Laurent Destailleur
8b1455f29e FIX Cash fence 2019-01-07 19:35:20 +01:00
Laurent Destailleur
527ef8bdc8 Add nb of invoice to help cash fence 2019-01-07 19:02:38 +01:00
ldestailleur
1b19f5153b Fix cash fence feature 2019-01-03 14:18:02 +01:00
Alexandre SPANGARO
c4dbf41530 Look & feel 2018-12-30 21:21:40 +01:00
Alexandre SPANGARO
a2075b9d2c V9 look & Feel, etc 2018-12-30 20:32:44 +01:00
ldestailleur
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
ldestailleur
0353bd5302 FIX sql error when resetting payment mode / term 2018-12-29 07:48:47 +01:00
Laurent Destailleur
0f76279a03 FIX Missing token and style 2018-12-27 03:46:14 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
d9b8a8c8ae Debug cash fence feature 2018-12-19 16:12:55 +01:00
Laurent Destailleur
b0652494b5 Debug cash fence 2018-12-19 15:40:01 +01:00
Laurent Destailleur
707af49025 FIX Missing last month on vat report per month 2018-12-19 12:07:26 +01:00
Laurent Destailleur
6b5c0d1ea1 Save cash fence event into unalterable log 2018-12-17 11:41:59 +01:00