Commit Graph

8501 Commits

Author SHA1 Message Date
André Schild
1c0e15192d Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
2019-01-15 20:43:16 +01:00
delcroix Patrick
9d2d4bc91d
Fix compatibiliy issue with pgSQL 2019-01-15 17:06:48 +01:00
Laurent Destailleur
19be47dbf7 Code comment 2019-01-12 01:22:08 +01:00
Laurent Destailleur
22d4afbb62 Missing trans 2019-01-10 01:54:06 +01:00
Laurent Destailleur
48e407740d Fix tooltip 2019-01-10 01:49:49 +01:00
Laurent Destailleur
fbd490da15 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 13:29:47 +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
d9999d61f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
Laurent Destailleur
d929d93376 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:19:35 +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
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +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
mapiolca
bab82a77b5
Update card.php
Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.
2019-01-05 22:42:51 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
1b19f5153b Fix cash fence feature 2019-01-03 14:18:02 +01:00
ldestailleur
7cb3b8dfec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:26 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +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
ldestailleur
2225d0a41e FIX sql error when resetting payment mode / term 2018-12-28 23:16:44 +01:00
Laurent Destailleur
0f76279a03 FIX Missing token and style 2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a FIX Missing token and style 2018-12-27 03:45:30 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Regis Houssin
8f4c452075 FIX replace deprecated "print_fiche_titre" with "load_fiche_titre"
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2018-12-25 08:34:26 +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
9b55cc401e Fix trans 2018-12-22 11:32:27 +01:00
Laurent Destailleur
ae6596cac7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:29 +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
e014fdc20b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 11:43:02 +01:00
Laurent Destailleur
6b5c0d1ea1 Save cash fence event into unalterable log 2018-12-17 11:41:59 +01:00
Laurent Destailleur
e06b06c788 Work on cash fence 2018-12-17 10:37:56 +01:00
Laurent Destailleur
e0e298f07b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed Standardize code. 2018-12-17 03:25:45 +01:00
Laurent Destailleur
72c5943c55 Execute trigger so we can record line into unalterable log table 2018-12-16 17:53:23 +01:00
Laurent Destailleur
ce2d67f225 Fix phpcs 2018-12-16 17:45:51 +01:00
Laurent Destailleur
e5e4ef7b8c Work on cash fence 2018-12-16 16:47:09 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c Work on cash fence 2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
699766223f Fix phpcs 2018-12-16 13:00:24 +01:00
Laurent Destailleur
5dc9b44931 Fix phpcs 2018-12-16 12:59:59 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
2bfc5fe235 Work on cash fence 2018-12-15 19:56:08 +01:00