Laurent Destailleur
4a61c1b6ed
FIX lang not loaded
2018-12-11 13:25:09 +01:00
andreubisquerra
939f31c71f
First CashControl version
2018-12-08 21:33:54 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Laurent Destailleur
5ce26bae1b
Fix form of bank info for CH
2018-12-04 22:01:35 +01:00
Laurent Destailleur
138640fc63
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb
Standardize code
2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
Laurent Destailleur
275eeca135
Trans
2018-12-04 13:09:58 +01:00
Chl
b67101c77c
corr. #10154
2018-12-03 18:09:25 +01:00
Ferran Marcet
7247b14bd9
FIX Lines are not inserted correctly if VAT have code
2018-12-03 12:28:17 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +01:00
Chl
864ce85341
NEW adding hooks to createRecurringInvoices()
...
For example : send the newly generated invoice by mail.
We send the counter and the total so launching some action
on the last loop (generated invoice or error) is possible.
(bonus: correcting error reporting $this->errors to $this->errors[] )
2018-12-02 01:34:13 +01:00
Chl
95b5d8790d
corr. typo
2018-12-02 01:34:13 +01:00
Chl
6ea0919ebb
facture-rec.class.php: reindent
2018-12-02 01:34:13 +01:00
BENKE Charlene
6ac3cfdd99
Update list.php
2018-12-01 23:48:36 +01:00
BENKE Charlene
b104c0889d
Update list.php
2018-12-01 23:44:24 +01:00
BENKE Charlene
f07d1411aa
Update list.php
2018-12-01 23:41:15 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018
...
fix typo error
2018-11-29 10:57:48 +01:00
Philippe GRAND
2b6810e2ab
FIX: bad URL
2018-11-28 16:37:49 +01:00
Laurent Destailleur
436a85ef7a
Fix missing email
2018-11-27 20:34:43 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Philippe GRAND
9bf0f12068
fix typo error
2018-11-26 14:32:04 +01:00
Laurent Destailleur
ed1062c440
Css
2018-11-25 11:59:49 +01:00
Laurent Destailleur
f0e4c262a3
Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card
...
FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete
2018-11-24 11:13:49 +01:00
Laurent Destailleur
0a057c8277
Clean var_dump
2018-11-22 20:47:53 +01:00
Laurent Destailleur
fe35e72e83
Fix perf. Make only one request per group for year N-1.
2018-11-22 20:45:50 +01:00
Laurent Destailleur
5727cf2910
Prepare code for performance enhancement
2018-11-22 20:09:27 +01:00
Laurent Destailleur
72fc0226e3
Optimize performance: Remove call for year N, can be done with total of
...
each month
2018-11-22 19:45:35 +01:00
Thibault Descamps
d63d8088ed
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_global_search_go_direct_on_card
2018-11-22 11:37:25 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
Laurent Destailleur
784c13d9d0
Fix label of month
2018-11-22 11:14:05 +01:00
Laurent Destailleur
21e9c02b11
Performance enhancement in Accounting Personalized report
2018-11-22 10:40:15 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Laurent Destailleur
be4dc40dfa
Fix standardize date format for payment between customer and supplier
2018-11-20 10:16:54 +01:00
Laurent Destailleur
4845e90d95
Fix update of hours for payment
2018-11-20 10:03:38 +01:00
Laurent Destailleur
4bf5a12f35
Fix trans
2018-11-20 09:56:03 +01:00
Laurent Destailleur
c0dac69116
Merge pull request #10031 from aspangaro/9.0_style
...
Fix Page Salaries stats - Look & feel v9
2018-11-19 18:14:35 +01:00
Alexandre SPANGARO
4e39065e29
Fix Page Salaries stats - Look & feel v9
2018-11-17 07:37:32 +01:00
atm-quentin
a0d5607ba5
FIX error travis
2018-11-16 15:29:05 +01:00
atm-quentin
56d4a8a737
revert some code
2018-11-16 15:16:48 +01:00
atm-quentin
70fdff5c27
revert getNextValue function + createfromclone entity
2018-11-16 11:23:14 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
e004fc2f5b
FIX block page if cant fetch
2018-11-16 11:17:34 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
atm-quentin
8e51204dff
manage invoice with multicompany
2018-11-16 11:14:33 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused
2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Regis Houssin
ffc9b02322
FIX missing one column
2018-11-15 18:28:12 +01:00
Regis Houssin
2d2e836965
FIX more simple
2018-11-15 17:45:33 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc
...
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
d20bb41cde
Merge pull request #10017 from hregis/8.0_bug
...
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-15 16:43:00 +01:00
Regis Houssin
6f90516f57
FIX check write permission for multicurrency
2018-11-15 09:40:08 +01:00
Regis Houssin
bcc83408e0
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-14 18:10:41 +01:00
Regis Houssin
976094043b
FIX missing GETPOST('entity')
2018-11-14 17:34:27 +01:00
Regis Houssin
3294fada3d
FIX working on invoice sharing (multicompany)
2018-11-14 14:59:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
patrick Delcroix
e9d3db084a
new: link to the compta-files.php in the accountancy left menu
2018-11-10 15:35:56 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
c74ad61365
Fix look and feel v8
2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796
Fix look and feel v8
2018-11-08 09:51:46 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
0c7f33e1ba
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-05 09:56:00 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-10-30 19:04:35 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
0127682996
Merge pull request #9881 from grandoc/8.0
...
merging and typo
2018-10-30 12:41:56 +01:00
Laurent Destailleur
8fbf5b1f33
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4
Fix deletion of draft invoice
2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6
Fix perm to delete
2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e
FIX Delete of draft invoice
2018-10-29 14:41:00 +01:00
Laurent Destailleur
85b8c9f219
FIX Delete of draft invoice
2018-10-29 14:35:42 +01:00
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey
2018-10-27 18:07:05 +02:00
Frédéric FRANCE
42a9abad56
remove fieldlabel and add fieldeditkey
2018-10-27 17:45:29 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
1b054f1b36
Fix invoice creation from contract was invoicing closed services #9087
2018-10-27 09:21:49 +02:00
Laurent Destailleur
087b68948d
Fix: do not use point for graph with too many points.
2018-10-26 17:32:32 +02:00
Laurent Destailleur
852b069785
Fix reponsive in stats pages
2018-10-26 15:46:17 +02:00
Philippe GRAND
f450e04856
Merge remote-tracking branch 'upstream/8.0' into 8.0
2018-10-26 15:38:15 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
c9dca22df2
Merge pull request #9854 from atm-john/NEW_missing_payment_date_col
...
NEW Add due date column in payment lists
2018-10-24 12:27:59 +02:00
Laurent Destailleur
65a39269d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-10-24 03:39:33 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
1d80e16ad1
Merge pull request #9831 from frederic34/payment
...
payments
2018-10-24 03:25:01 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
atm-john
bed5084bcf
Add missing Max payment date col
2018-10-23 21:44:45 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
Frédéric FRANCE
5f6cbda5a6
Update facture.class.php
2018-10-20 22:34:00 +02:00
Frédéric FRANCE
fbc5ce623e
payments
2018-10-20 17:17:21 +02:00
Laurent Destailleur
b32ffdbbb9
Clean code
2018-10-19 14:59:00 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
762d82f2fe
Move declaration into common
2018-10-19 13:38:05 +02:00
Laurent Destailleur
cff2b923f9
Merge pull request #9784 from ptibogxiv/patch-80
...
FIX harmony in date name with API
2018-10-19 13:29:59 +02:00
Frédéric FRANCE
256ee40d0a
Merge remote-tracking branch 'upstream/develop' into patch-16
2018-10-18 21:01:49 +02:00
Laurent Destailleur
05326e271d
FIX Filter on invoice type
2018-10-18 17:15:26 +02:00
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
Laurent Destailleur
41add1c251
Standardize code
2018-10-04 19:19:29 +02:00
Laurent Destailleur
6fcb45cf40
Rename page various_payment/index.php into list.php (coding rule)
2018-10-04 19:10:39 +02:00
Laurent Destailleur
17e4af50ec
Merge pull request #9680 from ATM-Nicolas/fix_wrong_variable_name
...
FIX : Wrong variable name
2018-10-04 18:47:08 +02:00
Laurent Destailleur
20f45db6b8
Merge pull request #9677 from grandoc/new_branch_04_10_2018
...
Standardize and update code
2018-10-04 18:33:24 +02:00
Laurent Destailleur
5034264d60
Debug / Standardize code
2018-10-04 18:27:49 +02:00
Laurent Destailleur
ebba33635b
Close #9674 by keeping old code present (this help for transition tests)
2018-10-04 18:20:57 +02:00
Laurent Destailleur
b3b2305651
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/pdf.lib.php
2018-10-04 17:56:56 +02:00
Laurent Destailleur
13759ea146
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2018-10-04 17:53:40 +02:00
John BOTELLA
0e310a7ffd
FIX invoice delay on invoice list
2018-10-04 14:11:51 +02:00
John BOTELLA
0b3d09fa64
Fix retained warranty delay on list
2018-10-04 12:01:24 +02:00
John BOTELLA
cf89b850ee
Fix retained warranty delay
2018-10-04 11:37:04 +02:00
John BOTELLA
55e26dc531
FIX invoice has delay
2018-10-04 11:09:16 +02:00
ATM-Nicolas
c048f51562
FIX : Wrong variable name
2018-10-04 09:54:40 +02:00
Philippe GRAND
8bee69277d
Standardize and update code
2018-10-04 09:33:30 +02:00
aplose
8ee7a48583
Fix issue #9434 : no array_options available when calling api :
...
I replace the deprecated code by the fetch_optionnals() recommanded call.
2018-10-03 15:15:46 +02:00
John BOTELLA
af66a8971a
NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT
2018-10-02 15:51:17 +02:00
John BOTELLA
30d62e9fc5
fix retained warranty amount
2018-10-01 15:19:35 +02:00
Laurent Destailleur
ae62204a79
Merge pull request #9628 from grandoc/new_branch_28_09_2018
...
Standardize and update code
2018-10-01 01:04:36 +02:00
Laurent Destailleur
adc36e7d63
Clean code
2018-10-01 00:20:47 +02:00
Laurent Destailleur
2f88f84e3b
Clean code
2018-09-28 22:13:42 +02:00
Laurent Destailleur
e2f450aa8c
Fix regession losing description.
...
Rename updateligne into updateline.
2018-09-28 16:15:17 +02:00
Philippe GRAND
15ff9f8917
Standardize and update code
2018-09-28 14:44:47 +02:00
Laurent Destailleur
118ff2d8d0
phpcs
2018-09-28 10:42:42 +02:00
John BOTELLA
d8cd1c3fef
Fix total retained warranty
2018-09-28 09:03:37 +02:00
Laurent Destailleur
a88dcfd1e4
Fix phpcs
2018-09-28 02:24:11 +02:00
John BOTELLA
70eddf5d55
Add retained warranty in list
2018-09-27 15:38:43 +02:00
Laurent Destailleur
e252a5f046
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-27 12:55:45 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
...
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
Laurent Destailleur
ee8b5030a0
Merge pull request #9610 from atm-john/FIX_situation_credit_note
...
Fix situation credit note
2018-09-27 09:26:23 +02:00
Laurent Destailleur
e3b1cb9fdb
Update facture.class.php
2018-09-27 09:25:37 +02:00
Philippe GRAND
746d73b8e6
Add some code comment
2018-09-25 17:26:57 +02:00
John BOTELLA
40369280ba
fix allow empty selection on form conditions reglement
2018-09-25 12:16:16 +02:00
John BOTELLA
022f842cb0
Fix display good progress for new situation invoices
2018-09-25 10:28:47 +02:00
John BOTELLA
791c373db5
FIX credit note progression
2018-09-25 09:54:58 +02:00
Laurent Destailleur
b93ab79679
FIX Error messages
2018-09-25 00:39:28 +02:00
John BOTELLA
b1380a6902
FIX situation invoice total with credit note
2018-09-24 16:12:00 +02:00
Laurent Destailleur
ad6895aa2e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:14:38 +02:00
Laurent Destailleur
f88170e22a
Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks
...
NEW Add somes hooks in bank planned entries
2018-09-23 15:49:50 +02:00
TuxGasy
db223af39b
Add somes hooks in bank planned entries
2018-09-22 18:44:00 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018
2018-09-21 10:12:48 +02:00
Laurent Destailleur
b05954fb1e
Merge pull request #9061 from delcroip/comptafiles
...
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
2018-09-20 19:45:46 +02:00
Philippe GRAND
803505b6b7
Standardize and update code
2018-09-20 12:27:06 +02:00
Frédéric FRANCE
126e5ae3ad
remove not needed require
2018-09-18 20:05:48 +02:00
Frédéric FRANCE
032f9729a5
correct trimParameters
2018-09-18 19:05:00 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters
...
trimParameters function
2018-09-18 15:04:32 +02:00
Laurent Destailleur
e65ec9f4ef
Merge pull request #9530 from frederic34/patch-15
...
reduce complexity of cchargesociales class
2018-09-18 15:02:44 +02:00
Laurent Destailleur
e6791e1763
Merge pull request #9526 from frederic34/patch-10
...
completely comment unused code
2018-09-18 14:59:55 +02:00
Philippe GRAND
a1b15f170e
Standardize and update code
2018-09-17 09:00:23 +02:00
Frédéric FRANCE
f935701d30
trimParameters
2018-09-16 15:35:19 +02:00
Frédéric FRANCE
b950043618
trimParameters
2018-09-16 15:16:08 +02:00
Frédéric FRANCE
367e202df0
reduce complexity of cchargesociales class
2018-09-16 13:54:17 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Laurent Destailleur
f7c2bd877a
Comment dead code
2018-09-16 10:39:30 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Frédéric FRANCE
7b3b020533
completely comment unused code
2018-09-16 09:41:38 +02:00
Laurent Destailleur
5eff159e27
Merge pull request #9489 from frederic34/patch-9
...
Completely comment unused code
2018-09-15 16:59:49 +02:00
Laurent Destailleur
961505d510
NEW Add filter on staff range in list of thirdparties
2018-09-14 01:29:03 +02:00
Frédéric FRANCE
a128ea821e
Completely comment unused code
2018-09-12 22:49:32 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Laurent Destailleur
82580cadf6
Merge pull request #9458 from frederic34/patch-17
...
Update account.class.php
2018-09-12 19:07:19 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
de8496773d
Merge pull request #9441 from grandoc/new_branch_09_09_2018
...
New branch 09 09 2018
2018-09-12 18:24:34 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5
...
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Laurent Destailleur
3662ebe3a3
Fix syntax error
2018-09-12 18:05:20 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Maxime Kohlhaas
c94689e9a9
FIX remain to pay for credit note was wrong on invoice list
2018-09-12 11:53:57 +02:00
Laurent Destailleur
aad6a0871f
FIX Lose filter on payment type or category after a sort on invoice list
...
Conflicts:
htdocs/compta/facture/list.php
2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb
FIX Lose filter on payment type or category after a sort on invoice list
2018-09-12 10:57:09 +02:00
delcroix Patrick
2a4c65726c
new: delete zip after download
...
and correct date 2.0
2018-09-11 22:14:58 +02:00
delcroix Patrick
e36bc24dee
fix:copyrights
2018-09-11 21:55:05 +02:00
delcroix Patrick
e3920edb79
correct for invoice supplier links
2018-09-11 21:53:47 +02:00
Frédéric FRANCE
cdc5a174aa
Update account.class.php
2018-09-11 00:29:01 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Philippe GRAND
b40fe8e4c9
Standardize and update code
2018-09-09 12:07:14 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Philippe GRAND
7fcbd0fe42
Standardize and update code
2018-09-09 11:10:32 +02:00
Frédéric FRANCE
c2ad09cc0e
replace select_date
2018-09-09 10:11:27 +02:00
Frédéric FRANCE
b2a58067d9
replace select_date
2018-09-09 09:56:33 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
Frédéric FRANCE
ee8d56e047
Update card.php
2018-09-08 23:18:38 +02:00
Frédéric FRANCE
ef2ee8a6e4
Update card.php
2018-09-08 23:17:29 +02:00
Laurent Destailleur
84bbe8684b
Fix scrutinizer
2018-09-08 18:38:24 +02:00
Frédéric FRANCE
80880d8fb9
replace select_date by selectDate
2018-09-08 13:00:39 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0
...
FIX : Homepage links were using wrong topmenus
2018-09-07 19:35:10 +02:00
Laurent Destailleur
0ef17fe581
FIX Problems with permissions of module to record payment of salaries
2018-09-07 13:32:56 +02:00
Maxime Kohlhaas
a5f4a74ecc
FIX : Homepage links were using wrong topmenus
2018-09-06 14:49:48 +02:00
Philippe GRAND
9025fd5891
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
2018-09-06 14:33:46 +02:00
Philippe GRAND
844333688b
typo
2018-09-06 14:33:22 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 18:51:21 +02:00
Philippe GRAND
056b0b26cc
fix : Public member variable _fetched must not be prefixed with an underscore
2018-09-05 15:39:04 +02:00
Philippe GRAND
38ca6096b2
Standardize and update code
2018-09-05 10:31:12 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore
2018-09-04 22:52:55 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
bdcac95761
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 15:15:23 +02:00
Philippe GRAND
0492492df1
fix merge
2018-09-04 12:30:06 +02:00
Laurent Destailleur
3ef808cb9b
Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken
2018-09-04 11:23:28 +02:00
Laurent Destailleur
9042d341f0
FIX #9316 Error when listing invoices
2018-09-04 11:19:31 +02:00
Laurent Destailleur
e7d2bcc34c
FIX #9316 Error when listing invoices
2018-09-04 11:17:08 +02:00
Laurent Destailleur
9697bdf3b0
FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES
2018-09-04 10:38:09 +02:00
Laurent Destailleur
db6f80e2ff
FIX invoice popup hide localtax2 and 3 if not defined
2018-09-04 00:42:15 +02:00
Laurent Destailleur
3d50c454c1
Code comment
2018-09-03 17:05:44 +02:00
Frédéric FRANCE
22b9632555
move phpcs:ignore
2018-09-02 21:08:57 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore
2018-09-02 20:37:12 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore
2018-09-02 14:01:37 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +02:00
Philippe GRAND
3de16a145e
Standardize and update code
2018-09-02 11:08:41 +02:00
Philippe GRAND
c4f05aff28
Standardize and update code
2018-09-02 10:42:31 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore
2018-09-02 09:57:19 +02:00
Philippe GRAND
ae2df6be11
Standardize and Update code
2018-09-01 23:04:46 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Philippe GRAND
c013f9cf3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
...
NEW hook formConfirm always called if hooked
2018-09-01 14:50:08 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Philippe GRAND
7b47c79bc3
precise label comment
2018-09-01 14:06:58 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0
precise label comment
2018-09-01 13:22:08 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018
...
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Philippe GRAND
bb05e80a87
Standardize and update code
2018-08-31 18:47:25 +02:00
Philippe GRAND
edaa575435
Standardize and update code
2018-08-31 18:36:15 +02:00
Philippe GRAND
2f307aae21
Standardize and update code
2018-08-31 18:06:17 +02:00
Philippe GRAND
9e880d3e72
Standardize and update code
2018-08-31 17:55:31 +02:00
Laurent Destailleur
6af8f8f475
Fix trans
2018-08-31 16:57:50 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018
2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650
WTF...
2018-08-30 12:03:20 +02:00
ksar-ksar
49d3bea192
Remove the test
...
After discussion with Frederic, the best solution is to remove the test
2018-08-30 11:27:48 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Frédéric FRANCE
7b2bfb28c2
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 12:48:12 +02:00
Philippe Grand
0ab593fdb1
Merge branch 'develop' into new_branch_29_08_2018
2018-08-29 12:47:01 +02:00
Philippe GRAND
4b7dd5ace3
Fix white spaces
2018-08-29 12:29:05 +02:00
Philippe GRAND
88ad651743
Fix white spaces
2018-08-29 12:26:47 +02:00
Philippe GRAND
e92b96acfd
try to fix space errors
2018-08-29 12:00:53 +02:00
Laurent Destailleur
0eb4f8bb96
NEW Can set the datestart and dateend of cron job into module descriptor
2018-08-29 11:47:20 +02:00
Laurent Destailleur
b5c2383f65
Fix type of invoice encoded twice
2018-08-28 18:34:53 +02:00
Philippe Grand
b7bc34963a
Update paymentsalary.class.php
2018-08-28 10:41:05 +02:00
Philippe Grand
1337d85a29
Update bankcateg.class.php
2018-08-28 10:40:41 +02:00
Philippe GRAND
65af8f902f
Update and standardize code
2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
...
Update and standardize code
2018-08-28 02:13:28 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-25 09:07:04 +02:00
ksar-ksar
a844855ade
Update hook formConfirm
...
The hook should be called when the $formconfirm is not empty
2018-08-24 16:40:26 +02:00
Laurent Destailleur
32594e8048
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-24 10:47:10 +02:00
Laurent Destailleur
a82d86cec4
FIX warning for late template invoices to remove when suspended
2018-08-24 10:46:47 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +02:00
Philippe Grand
137b715868
Update deplacementstats.class.php
2018-08-22 22:28:33 +02:00
Philippe GRAND
504b0e3d16
Update and standardize code
2018-08-22 18:34:50 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6
Update and standardize code
2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123
...
New : Add total price on dashboard
2018-08-21 13:33:33 +02:00
Laurent Destailleur
5e09d5160f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 13:17:20 +02:00
Laurent Destailleur
0f1e5a78c6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-21 13:17:11 +02:00
Laurent Destailleur
7103bfd7aa
Merge pull request #9253 from frederic34/patch-11
...
Update list.php
2018-08-21 13:11:26 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018
...
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
8032c314d4
Merge pull request #9252 from bugness-chl/8.0-2
...
FIX adding GROUP BY for PostgreSQL
2018-08-21 12:51:56 +02:00
Laurent Destailleur
26d34422b0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-19 03:01:26 +02:00
Laurent Destailleur
116f4a1a09
Fix responsive
2018-08-19 02:22:12 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Frédéric FRANCE
e63a748a70
Update list.php
2018-08-16 11:59:58 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Chl
9e8485c279
FIX adding GROUP BY for PostgreSQL
2018-08-16 01:14:42 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
...
return comment
2018-08-16 00:35:39 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Frédéric FRANCE
d25fa61998
return comment
2018-08-14 13:14:55 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
b977c3a9f5
Fix translation
2018-08-13 14:04:10 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
2f559a7edb
Merge pull request #9199 from atm-quentin/FIX_hook_update_price
...
NEW Add hook changeRoundingMode in update_price
2018-08-12 18:17:52 +02:00
Laurent Destailleur
35c22b231f
Merge pull request #9223 from grandoc/new_branch_08_08_2018
...
Standardize
2018-08-12 18:12:18 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
John BOTELLA
681ae88e97
fix display cond
2018-08-10 16:59:22 +02:00
John BOTELLA
6fad0ea5bd
Add retained warranty to pdf
2018-08-10 16:03:39 +02:00
John BOTELLA
d6d8f98f38
add retained warranty cond field and add forms
2018-08-10 15:06:00 +02:00
ATM-Nicolas
d8d54d246c
FIX : Pagination on withdraw request list
2018-08-10 15:05:21 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3
2018-08-09 11:31:48 +02:00
John BOTELLA
06be98c638
add date field
2018-08-08 17:36:39 +02:00
Philippe GRAND
5b8b4a1415
Standardize
2018-08-08 12:29:36 +02:00
Juanjo Menent
229a5d3532
Merge pull request #9203 from grandoc/new_branch_04_08_2018
...
comment translation
2018-08-08 11:07:18 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
atm-quentin
6662bf05ba
FIX hook on update price AND fix id on line
2018-08-03 11:47:43 +02:00
ATM-Nicolas
342a3ef663
NEW : Withdraw request massaction
2018-08-03 09:57:29 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters
...
FIX : page must always be 0 when we search
2018-08-02 17:48:35 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018
...
standardize
2018-08-02 11:27:02 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3
...
NEW : Add project on salaries
2018-08-02 11:19:34 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
Alexandre SPANGARO
ee61a88540
Small fix
2018-08-01 07:46:17 +02:00
John BOTELLA
4ddca02bb9
fix situation line's total
2018-07-31 14:58:33 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3
2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0
New : Add project on salaries
2018-07-31 07:45:03 +02:00
Philippe GRAND
d673848028
standardize
2018-07-30 17:28:44 +02:00
Philippe GRAND
fb565b15c5
standardize
2018-07-29 19:16:28 +02:00
Frédéric FRANCE
c991a4d204
trim trailing
2018-07-26 18:05:20 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Philippe GRAND
7d5464cfbc
Clean and update code
2018-07-25 15:25:23 +02:00
Laurent Destailleur
e024ea9c05
Merge pull request #9146 from grandoc/new_branch_24_07_2018
...
Clean and update code
2018-07-24 21:41:12 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Philippe GRAND
2a6f050e32
Clean and update code
2018-07-24 18:28:56 +02:00
Laurent Destailleur
ece655a84a
Merge pull request #9128 from atm-john/fix_situation_invoice_status
...
Fix situation invoice status
2018-07-24 17:49:53 +02:00
Laurent Destailleur
869a97c8d1
Update card.php
2018-07-24 17:49:10 +02:00
Laurent Destailleur
a469f841f7
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf
...
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
2018-07-24 17:47:37 +02:00
Laurent Destailleur
bb9c53b41f
Merge pull request #9118 from bugness-chl/8.0
...
corr. "group by" for PostgreSQL
2018-07-24 17:43:36 +02:00
Chl
0f115dafee
2 bugfix for PDF generated by Templates/Cron: DueDate and translation
...
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
2018-07-24 00:39:21 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
John BOTELLA
0c01f6e139
Fix situation invoice status
2018-07-20 15:53:32 +02:00
Laurent Destailleur
5523312f87
Fix missing email
2018-07-18 15:36:07 +02:00
Laurent Destailleur
38de5a8f2a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-18 14:25:19 +02:00
Laurent Destailleur
bef777e19d
Fix default order for bank entry list
2018-07-18 14:24:58 +02:00
Chl
b306394c15
corr. group by pour PostgreSQL
2018-07-17 23:57:21 +02:00
Laurent Destailleur
f60e04dcb4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 22:33:36 +02:00
Laurent Destailleur
cecb0f8829
Fix missing lib
2018-07-17 22:33:20 +02:00
Laurent Destailleur
4b044779dc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1
Fix label of copy must not be same
2018-07-17 22:31:28 +02:00
Laurent Destailleur
47cb1f920e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 21:43:08 +02:00
Laurent Destailleur
7662f8f25c
Fix balance
2018-07-17 21:39:41 +02:00
Laurent Destailleur
c68b9493e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 21:21:20 +02:00
Laurent Destailleur
a7853211d6
Fix balance when sorting of value date desc
2018-07-17 21:20:38 +02:00
Laurent Destailleur
34c2facff1
Fix missing link on bank account
2018-07-17 18:16:30 +02:00
Laurent Destailleur
387abf2da8
Merge pull request #9057 from inoveaconseil/checkRightOnLink
...
ADD Check right on link
2018-07-16 09:31:21 +02:00
Laurent Destailleur
e4be3ab954
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:09:51 +02:00
Laurent Destailleur
1b33703cd8
Fix missing country code
2018-07-13 09:08:42 +02:00
gauthier
80ff7fa86f
FIX : case when we valid form with keyboard
2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
2018-07-11 09:51:36 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
ed6ec8138d
Fix filter on invoice status
2018-07-06 16:06:15 +02:00
Laurent Destailleur
fb84211714
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 12:45:44 +02:00
Laurent Destailleur
6c5264fabb
Fix label
2018-07-06 12:45:20 +02:00
Inovea Conseil
7f137adef9
ADD check user's rights
2018-07-06 08:07:38 +02:00
delcroix Patrick
5f7a308552
Merge branch 'develop' into comptafiles
2018-07-05 22:35:40 +02:00
patrick Delcroix
a90974378e
FIX: credit / debit
2018-07-05 22:31:29 +02:00
patrick Delcroix
0e7ba92784
New: Accounting dossier file checks page
...
Page to check to attachement of those operation
invoice, invoicesupplier, salary, donation, Expense, tax
2018-07-05 21:34:36 +02:00
Inovea Conseil
5011f252c1
ADD check user's rights
2018-07-05 19:00:41 +02:00
BENKE Charlene
c169ff4b97
Update facture.class.php
2018-07-05 12:01:48 +02:00
Inovea Conseil
30cff2bb36
ADD check user's rights
2018-07-05 11:52:41 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
3c176adb38
Fix more complete fix for bad label in creating invoice from other obj
2018-07-02 16:46:30 +02:00
Laurent Destailleur
cae7cabe6d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-02 16:22:55 +02:00
Laurent Destailleur
b22754c60b
FIX label of source object
2018-07-02 16:22:40 +02:00
Laurent Destailleur
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany
...
Fix: possibility to overload permissions (multicompany sharing)
2018-07-02 16:12:40 +02:00
Laurent Destailleur
63f3143718
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
11021353da
Fix text in payment area of crabe pdf
2018-07-02 11:33:33 +02:00
Regis Houssin
26495fb698
Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!
2018-07-01 18:49:37 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop
...
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-30 01:26:08 +02:00
Laurent Destailleur
da138db528
FIX combo into popup become crazy with IE10
...
Conflicts:
htdocs/asset/card.php
htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279
FIX combo into popup become crazy with IE10
2018-06-28 12:05:02 +02:00
STAGIAIRE-PC\Pierre
a94eeaa500
adding the possibility to personnalize ent_to_end and ustrd of a bank levy
2018-06-27 10:53:45 +02:00
Laurent Destailleur
969b272576
Rename menu entries and report title for better understanding
2018-06-26 11:18:31 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
7f8570f720
Fix lang loading
2018-06-26 00:48:43 +02:00
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018
...
clean and update code
2018-06-24 13:47:26 +02:00
Laurent Destailleur
0170906524
Look and feel
2018-06-23 14:39:24 +02:00
Laurent Destailleur
7daee6dc6b
A lot of fix of css and look and feel v8
2018-06-23 00:07:56 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8
clean and update code
2018-06-22 16:27:11 +02:00
Laurent Destailleur
5bee324578
Update paiement.class.php
2018-06-22 14:34:59 +02:00
Laurent Destailleur
d81398e72d
Fix info on tooltip
2018-06-18 16:27:25 +02:00
Laurent Destailleur
ad2df304b4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/fourn/commande/card.php
htdocs/societe/class/societe.class.php
2018-06-18 13:31:29 +02:00
Laurent Destailleur
95ee3325fc
Part of fix of #8972
2018-06-18 11:11:07 +02:00
Philippe GRAND
4c08e2ebf3
clean and update code
2018-06-17 14:33:29 +02:00
Laurent Destailleur
7c7ee56832
Fix missing email
...
Fix avoid warning
2018-06-17 01:50:10 +02:00
Ferran Marcet
a21e138c70
Fix: Avoid converting into reduction twice and draft invoice
2018-06-15 11:19:04 +02:00
Laurent Destailleur
9717a32a2e
Merge pull request #8960 from grandoc/new_branch_13_06_2018
...
clean code
2018-06-14 12:01:19 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Philippe GRAND
a937d9e657
clean code
2018-06-13 22:52:24 +02:00
Laurent Destailleur
c586f2ecf7
Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE
...
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
2018-06-13 21:20:42 +02:00
Laurent Destailleur
3703a7c4b0
Merge pull request #8952 from papoteur-mga/patch-1
...
Fix: In list of bank accounts, display the balance in formatted price
2018-06-13 20:40:27 +02:00
altatof
d42f00bca9
FIX : pu_ht_devise was not converted to numeric so decimals were lost
...
when clculating total_ht_devise
2018-06-13 16:35:52 +02:00
Papoteur
6567365086
In list of bank accounts, display the balance in formatted price
...
[Problem to solve]
in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine.
[Solution]
Change a parameter in the price function to format the balance with the required number of decimals.
2018-06-13 08:39:26 +02:00
Marc de Lima Lucio
e992187f4c
FIX: handle sortorder on multiple columns + potential SQL field mismatch
2018-06-12 16:00:16 +02:00
Regis Houssin
7ce2ebf1a9
Fix: wrong var name
2018-06-07 16:25:47 +02:00
Laurent Destailleur
a7b38db31f
Fix bug reported by scrutinizer
2018-06-06 18:55:50 +02:00
Laurent Destailleur
b57f3a3f36
Fix bug reported by scrutinizer
2018-06-06 18:41:35 +02:00
Laurent Destailleur
6b24d81afc
Fix bug reported by scrutinizer
2018-06-06 18:40:56 +02:00
Laurent Destailleur
a8e06abc4f
Fix bug reported by scrutinizer
2018-06-06 18:35:11 +02:00
gauthier
77e7932671
FIX : sometimes amounts are identical but php find them different.
2018-06-05 11:33:58 +02:00
Laurent Destailleur
40ab046bd1
Merge pull request #8904 from Mavyre/develop
...
FIX Errors on synchronize rates when accessing Dolibarr from HTTPS
2018-06-04 13:46:03 +02:00
Laurent Destailleur
7c0afbe025
Clean code
2018-05-31 17:12:08 +02:00
Mavyre
6b86e1c3bb
FIX Bookkeeping report wrong display
2018-05-30 21:38:57 +02:00
Laurent Destailleur
d8d4d15b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Laurent Destailleur
3733169120
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/recap-compta.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 11:09:53 +02:00
florian HENRY
b65b545e0f
add hook on balence pages
2018-05-29 16:29:14 +02:00
Laurent Destailleur
4d60fb3468
Fix size of popup
2018-05-29 10:57:14 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs
...
loadlangs
2018-05-29 10:07:10 +02:00
Laurent Destailleur
f83dedf1b0
Fix space/tab
2018-05-29 10:04:20 +02:00
Neil Orley
748be12da2
Get external contacts ids instead of BILLING contacts ids.
2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2018-05-28 09:30:21 +02:00
Laurent Destailleur
5da89e1cad
Remove log
2018-05-27 19:33:46 +02:00
Laurent Destailleur
f3f252e88b
Fix duplicate record before creating primary key
2018-05-27 19:31:03 +02:00
Frédéric FRANCE
5c8f966898
Merge remote-tracking branch 'upstream/develop' into loadlangs
2018-05-27 18:41:17 +02:00
Laurent Destailleur
3f489ee3c6
Fix look and feel v7 for popup on ref of social contributions payments
2018-05-27 17:58:32 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Frédéric FRANCE
84f2b31d46
loadlangs
2018-05-27 09:40:17 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs
2018-05-27 09:27:09 +02:00
Frédéric FRANCE
812b182680
loadlangs
2018-05-26 17:04:23 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs
2018-05-26 16:03:19 +02:00
Frédéric FRANCE
cbed5c8349
loadlangs
2018-05-26 15:41:32 +02:00
Laurent Destailleur
182abfdb5b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/societe/card.php
2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/list.php
htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty
...
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Laurent Destailleur
b25c7e44d3
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice
...
FIX : test is_erasable() must be done before call function delete()
2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4
Update card.php
2018-05-25 11:04:04 +02:00
Laurent Destailleur
205732e240
Merge pull request #8822 from aspangaro/8.0-b27
...
Salaries : Move to LoadLangs
2018-05-25 10:34:36 +02:00
atm-quentin
eb224e43a5
FIX missing filters during ordering
2018-05-24 10:41:24 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty
2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-23 17:05:08 +02:00
Laurent Destailleur
a1c799507a
Fix $contactobject not always defined
2018-05-23 08:16:24 +02:00
Laurent Destailleur
d072c2eb5d
Fix turnover invoiced by vat rate and country. Use fiscal month start.
2018-05-22 23:09:27 +02:00
Neil Orley
15e02c7082
NEW : adds billing contacts ids to REST API returns
...
adds billing contacts ids to REST API returns for proposals, orders and invoices
2018-05-22 11:40:32 +02:00
Laurent Destailleur
745aa4bd73
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-21 23:38:46 +02:00
Laurent Destailleur
8951c4a7a5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-21 23:36:47 +02:00
Laurent Destailleur
de84f0e687
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
Alexandre SPANGARO
3fd55585b7
Salaries : Move to LoadLangs
2018-05-20 08:00:42 +02:00
gauthier
4c3f9d6d5e
FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url
2018-05-18 15:20:16 +02:00
Laurent Destailleur
24281028b7
Merge pull request #8807 from inoveaconseil/patch-2
...
Fix missing params for commonGenerateDocument
2018-05-18 11:43:11 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation
...
Add credit note compatibility with situation invoice.
2018-05-18 11:34:10 +02:00
Laurent Destailleur
e2369dea29
FIX #8722
2018-05-18 11:17:21 +02:00
Laurent Destailleur
dd53f414f8
Merge pull request #8788 from bugness-chl/develop
...
Fix #8722 useless sql ORDER BY
2018-05-18 11:16:08 +02:00
John
3dd11e1eaf
Fix discount id
2018-05-18 11:02:04 +02:00
Laurent Destailleur
689ef37d56
Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element
...
Add propals lines inport on invoices.
2018-05-18 08:55:29 +02:00
Inovea Conseil
5804d1d4a3
Fix missing params for commonGenerateDocument
...
ADD param moreparams for compatibility with commonGenerateDocument
2018-05-17 10:16:44 +02:00
John
8175d90816
change case
2018-05-17 09:01:49 +02:00
Laurent Destailleur
ac97ba9e36
Fix deletion of stripe card
...
Solve validation of recurring invoice
2018-05-16 20:41:01 +02:00
John
fddd3156b1
add hidden conf
2018-05-16 16:15:30 +02:00
John
c67ab2a758
add hidden conf
2018-05-16 16:14:49 +02:00
John
4a0195deee
Fix merge mistake
2018-05-16 15:55:56 +02:00
John
f773317bf5
remove comment and move table
2018-05-16 15:55:42 +02:00
John
b01893d536
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull
2018-05-16 15:29:57 +02:00
Laurent Destailleur
ef395fc36b
Fix scrutinizer bugs
2018-05-16 15:23:52 +02:00
John
05bb98f4c0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-05-16 11:49:37 +02:00
Laurent Destailleur
3e27d7dd2a
Report of turnover by vat rate / product type / country
2018-05-15 17:51:19 +02:00
Laurent Destailleur
7099068f05
Fix calculation of vat paid
2018-05-15 14:47:04 +02:00
John
b42c87256c
Fix_situation_discount_used
2018-05-14 14:55:33 +02:00
Chl
9b2f62791b
Fix #8722 useless sql ORDER BY
2018-05-13 15:52:47 +02:00
atm-john
6b2dfa0528
Extend lines import to propal
2018-05-10 21:06:18 +02:00
Laurent Destailleur
4efc9f95cd
FIX #8775 (try better fix)
2018-05-10 11:48:18 +02:00
atm-quentin
8cd6c72a2f
NEW advanced rights
2018-05-07 10:04:43 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
97f161b276
Update list.php
2018-05-05 14:25:44 +02:00
Abbes Bahfir
17b8de2cdd
New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED
2018-05-05 12:57:29 +01:00
atm-quentin
ec5e84075e
NEW Rights to ignore price min
2018-05-03 10:18:38 +02:00
atm-quentin
21b387a4c4
NEW thirdparty categ filter on lists
2018-05-02 15:01:32 +02:00
Laurent Destailleur
3340598cf8
FIX Projet is not prefilled when created from overwiew page
2018-05-01 14:15:11 +02:00
Laurent Destailleur
3374c50e2d
CSS
2018-05-01 10:42:09 +02:00
Laurent Destailleur
b9e6f6eab8
Fix link to navigate in year only if filter is for a full year
2018-05-01 10:35:12 +02:00
Laurent Destailleur
ee69bdd3da
Merge pull request #8699 from DazzX/improve_stat_page
...
New : Reactivate next and previous link
2018-05-01 10:26:49 +02:00
Laurent Destailleur
de0721aba9
Merge pull request #8698 from DazzX/result_stat_refresh_link
...
Fix bug when click on refresh button
2018-05-01 10:22:07 +02:00
Laurent Destailleur
05d1613628
Merge pull request #8697 from DazzX/turnover_stat_refresh_link
...
Fix link "refresh" on turnover report
2018-05-01 10:20:04 +02:00
Laurent Destailleur
9eea58e4c5
Translation
2018-04-30 20:19:28 +02:00
Laurent Destailleur
c9cca57b0f
NEW monthly VAT report show "Claimed for the period" + "Paid during this
...
period"
2018-04-30 20:02:16 +02:00
Laurent Destailleur
1bf56e58b3
Work on vat report
2018-04-30 18:21:04 +02:00
Julien BARRET
bb2ef46ef4
Reactivate next and previous link
2018-04-30 00:24:47 +02:00
Julien BARRET
b099d834a0
Fix bug : when click on refresh button, next and previous button are broken.
...
Eg. in year 2018, next button point to year 4032!
2018-04-29 23:26:44 +02:00
Julien BARRET
efcc3f40fa
Fix link "refresh" on turnover report
2018-04-29 23:22:46 +02:00
Laurent Destailleur
2fc2c44de4
Fix phpcs
2018-04-29 20:18:50 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
aafab12f4b
Debug API for ticket module
2018-04-29 18:06:31 +02:00
Laurent Destailleur
1a9476bff5
Fix edition of label of a vat payment.
2018-04-28 20:17:39 +02:00
Laurent Destailleur
e72c2e6a11
Enhance sorting of field for lists on field with several sort criterias
2018-04-28 19:54:41 +02:00
Laurent Destailleur
2241418b33
Fix look and feel v7
2018-04-28 18:43:29 +02:00
Laurent Destailleur
e8fd5ea5cd
Better translation
2018-04-28 17:18:38 +02:00
Laurent Destailleur
94d6e178f7
Work on vat report code rewrite
2018-04-28 16:06:46 +02:00
Laurent Destailleur
257dc1cf77
Work on rewriting VAT reports
2018-04-27 19:17:34 +02:00
Laurent Destailleur
c50700470b
Remove deprecated file
2018-04-27 12:51:39 +02:00
Laurent Destailleur
e3142fff39
NEW Add method to register distributed payments on invoices
2018-04-27 11:38:31 +02:00
Laurent Destailleur
469d909126
Revert "Revert "NEW : Adds a contact to an invoice with REST API""
2018-04-27 10:46:09 +02:00
Laurent Destailleur
df9f4d3193
Revert "NEW : Adds a contact to an invoice with REST API"
2018-04-27 10:40:27 +02:00
Laurent Destailleur
fb582c2444
Merge pull request #8682 from Oeris/develop
...
NEW : Adds a contact to an invoice with REST API
2018-04-27 10:37:04 +02:00
Laurent Destailleur
db8ddc4712
Merge pull request #8680 from ATM-Nicolas/new_paymentsocial_trigger
...
NEW : Call to trigger on payment social contribution creation
2018-04-27 10:32:34 +02:00
Laurent Destailleur
3af67d4b92
Merge pull request #8679 from ATM-Nicolas/fix_wrong_trigger_name
...
FIX : Wrong trigger name
2018-04-27 10:32:17 +02:00
Laurent Destailleur
c40b50ca71
Fix typo
2018-04-27 10:23:09 +02:00
Laurent Destailleur
489318d4db
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-27 10:18:40 +02:00
Laurent Destailleur
aa30b946b6
Fix from #8677
2018-04-27 10:18:22 +02:00
Laurent Destailleur
27997b8c11
Merge pull request #8675 from ATM-Nicolas/fix_link_credit_note
...
Fix link credit note
2018-04-27 10:12:31 +02:00
Laurent Destailleur
3301c99b75
Merge pull request #8664 from DazzX/turnover_stat
...
Fix Year selector issue in turnover statistics page
2018-04-27 09:40:50 +02:00
Neil Orley
00fb4300fc
FIX : return type change from array to int
2018-04-26 12:03:55 +02:00
Neil Orley
bf3b99163d
NEW : Adds a payment for the list of invoices given as parameter
...
Adds a payment for the list of invoices given as parameter
ie : 1 payment for x invoice
2018-04-26 11:59:59 +02:00
Neil Orley
991d5c4215
NEW : Adds a contact to an invoice
...
Adds a contact to an invoice using the REST API
2018-04-25 16:04:21 +02:00
ATM-Nicolas
f71755d454
NEW : Call to trigger on payment social contribution creation
2018-04-25 09:34:57 +02:00
ATM-Nicolas
e058ab40a0
FIX : Wrong trigger name
2018-04-25 09:24:22 +02:00
Laurent Destailleur
5d01efb79d
Code comment
2018-04-24 20:27:02 +02:00
ATM-Nicolas
b272d766a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_link_credit_note
2018-04-24 11:48:49 +02:00
ATM-Nicolas
64dde1595b
FIX : Credit note links set from source invoice links
2018-04-24 11:48:26 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Julien BARRET
8256bd1889
Fix Year selector issue in turnover statistics page
2018-04-23 11:39:34 +02:00
Laurent Destailleur
32511422ab
Fix PSR2
2018-04-22 20:08:29 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
912d5c53f2
Standardize code
2018-04-21 15:54:05 +02:00
Laurent Destailleur
c81c744aaf
Clean deprecated var
2018-04-21 13:14:58 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
cef9782179
Clean defined constant at begin of pages
2018-04-21 12:00:55 +02:00
Laurent Destailleur
1031fcd796
logs
2018-04-21 00:37:05 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
faea6861c3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
htdocs/langs/en_US/bills.lang
2018-04-16 18:19:21 +02:00
Laurent Destailleur
622042e9b2
FIX Max nb of generation of recurring invoice should not show warning
2018-04-16 15:05:35 +02:00
Laurent Destailleur
f1ad3912e7
Fix multicompany compatibility for recurring invoice generation
2018-04-16 14:18:38 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
69c26e19a8
NEW Can edit the text color for title line of tables
2018-04-15 22:01:52 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
187cc35786
Look and feel v8
2018-04-14 22:23:56 +02:00
Laurent Destailleur
374a0723bf
Fix VAT report by rate
2018-04-13 22:20:14 +02:00
Laurent Destailleur
6f91b8019f
Remove warnings
2018-04-13 17:54:27 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
Laurent Destailleur
3078b890d4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/stripe/admin/stripe.php
2018-04-13 00:45:39 +02:00
Laurent Destailleur
421a794942
FIX #8559 Bug to generate cheque receipt
2018-04-12 17:22:51 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
590bc2948a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
2018-04-11 17:20:49 +02:00
Laurent Destailleur
628b437e28
Update card.php
2018-04-11 16:25:05 +02:00
Laurent Destailleur
9af052602a
Fix css
2018-04-11 12:54:57 +02:00
atm-arnaud
848d76ee78
FIX #8023
2018-04-10 14:43:32 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
John
24bf8cb162
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-04-09 16:21:37 +02:00
Laurent Destailleur
fae509e41d
Clean code
2018-04-09 14:25:15 +02:00
Laurent Destailleur
54a86dc2b1
Fix CSS
2018-04-09 11:42:43 +02:00
Laurent Destailleur
0475cb8018
FIX Permission for bookkeeper
2018-04-09 10:51:58 +02:00
John
63180f45a8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-09 09:17:26 +02:00
Laurent Destailleur
0c0f950338
Look and feel
2018-04-09 00:03:13 +02:00
Laurent Destailleur
cfa667f9df
Fix rounding in data shown
2018-04-09 00:01:15 +02:00
Laurent Destailleur
99ed9c4589
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/compta/facture/list.php
2018-04-08 13:10:10 +02:00
Laurent Destailleur
79af10fc83
Fix search filters
2018-04-08 13:01:42 +02:00
Laurent Destailleur
165ee9598a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
2018-04-07 21:52:51 +02:00
Laurent Destailleur
304adff973
FIX view of balance before field
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
2018-04-07 21:49:59 +02:00
Laurent Destailleur
893adae346
FIX view of balance before field
2018-04-07 21:45:06 +02:00
Laurent Destailleur
989d1c87c6
Fix link to reconcile
2018-04-07 20:06:19 +02:00
Laurent Destailleur
bacee3c298
Translation
2018-04-07 20:06:14 +02:00
Laurent Destailleur
88890cf9f4
Fix link to reconcile
2018-04-07 20:03:59 +02:00
Laurent Destailleur
b801a465f5
Translation
2018-04-07 19:42:47 +02:00
Laurent Destailleur
4d2d9193b9
Work on VAT reports to use option MAIN_INFO_VAT_RETURN
2018-04-07 15:47:13 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
15c7bbf9d8
Fix input lost when error
2018-04-07 12:28:10 +02:00
Laurent Destailleur
e7d69b18bd
Merge pull request #8504 from ATM-Nicolas/develop
...
NEW : Add link between credit note invoice and origin
2018-04-06 09:15:02 +02:00
TuxGasy
47dcc0d5c6
fix notrigger ignored on BILL_CREATE
2018-04-05 18:32:41 +02:00
Laurent Destailleur
9892a97424
Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE
...
fix notrigger ignored on BILL_CREATE
2018-04-05 18:27:45 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
...
New import lines from linked element
2018-04-05 18:26:47 +02:00
John
b02f34b038
Add line edit progress test
2018-04-05 17:13:45 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
John
689b3e3b64
Fix outing invoice ligne progress
2018-04-05 11:25:11 +02:00
John
b37a2f17bf
Fix credit note update on remove from cycle action
2018-04-05 10:48:20 +02:00
John
e966d11356
Fix credit note card apparence
2018-04-05 09:46:55 +02:00
TuxGasy
e5664f9630
fix notrigger ignored on BILL_CREATE
2018-04-04 20:32:36 +02:00
John
ce24ca08ee
move list of situation table and fix credit note display
2018-04-04 12:33:48 +02:00
ATM-Nicolas
b9a91c667f
NEW : Add link between credit note invoice and origin
2018-04-04 09:33:59 +02:00
John
299859d0c4
add action to remove from cycle
2018-04-03 17:34:20 +02:00
John
70321a8b71
add button to remove from cycle
2018-04-03 15:12:44 +02:00
John
b7681e7249
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-03 14:12:49 +02:00
John
d689e88b92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-04-03 11:38:12 +02:00
John
227e4ef9a6
fix php compatibility
2018-04-03 10:50:15 +02:00
Laurent Destailleur
2d3a55a6a8
Restore broken confirmation popup
2018-03-31 23:39:08 +02:00
Laurent Destailleur
927d86f27f
Revert "NEW: formconfirm in javascript"
...
This reverts commit 50790d5527
2018-03-31 23:10:12 +02:00
Laurent Destailleur
d21143831c
Clean code
2018-03-31 22:44:32 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
7c394733e4
Merge pull request #8445 from ATM-Consulting/develop_atm
...
NEW: bank reconcile: checkbox to select all bank operations
2018-03-29 14:49:41 +02:00
Laurent Destailleur
f2022241e3
Merge pull request #8466 from aspangaro/8.0-a11
...
Add label project in tooltip in customer/supplier list
2018-03-29 13:44:13 +02:00
Laurent Destailleur
1c86eb1c44
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Alexandre SPANGARO
c012c330de
Merge remote-tracking branch 'uptream/develop' into 8.0-a11
2018-03-27 21:45:35 +02:00
Alexandre SPANGARO
6e27da605a
Add label project in tooltip in customer/supplier list
2018-03-27 21:41:25 +02:00
Laurent Destailleur
34fae0bd48
Merge pull request #8456 from atm-greg/Fix_bankentries_list
...
FIX sql error using no category
2018-03-27 17:49:01 +02:00
Laurent Destailleur
51cd793d80
Fix log and duplicate vat_by_date function
2018-03-27 14:37:29 +02:00
Laurent Destailleur
f9ee2930e2
FIX Data on income/expense report was always 0
2018-03-27 14:16:59 +02:00
Laurent Destailleur
0b13cd17ac
FIX Some report have data when several chart of accounts exists
...
FIX Detail per account not visible when total < 0
2018-03-27 13:55:10 +02:00
Laurent Destailleur
2b588b9e43
FIX Initial month on report income/expense per predefined group
2018-03-27 13:37:40 +02:00
Laurent Destailleur
d1e9a4719b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2018-03-27 12:27:15 +02:00
atm-greg
91d6a1b621
fix sql error using no category
2018-03-27 06:40:12 +02:00
Laurent Destailleur
b44e791c0a
Work on vat reports
2018-03-26 21:39:18 +02:00
Laurent Destailleur
89bf781fe6
FIX Add warning when expense report line not into range
...
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
2018-03-26 14:13:40 +02:00
Laurent Destailleur
c7e93a5a3b
Serious enhancement in auto subscription for member module
2018-03-23 22:49:08 +01:00
John
88fab15c60
Change situation display
2018-03-23 17:12:09 +01:00
Marc de Lima Lucio
50790d5527
NEW: formconfirm in javascript
2018-03-23 16:54:33 +01:00
John
6a676ea49e
fix percent
2018-03-23 12:24:47 +01:00
Marc de Lima Lucio
5c46d62acd
NEW: bank reconcile: checkbox to select all bank operations
2018-03-23 11:04:11 +01:00
Laurent Destailleur
171ad5dce2
Enhance code for template invoices
2018-03-22 21:42:19 +01:00
Laurent Destailleur
9980a5fbd0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2018-03-22 14:08:43 +01:00
John
b4983d0e6d
FIX invoice filter
2018-03-22 11:37:16 +01:00
John
fd86e90df2
Add create creadit note btn
2018-03-22 11:19:39 +01:00
Laurent Destailleur
227b830aa2
Fix visible rounding of abandonned amount
2018-03-22 09:41:30 +01:00
John
f91fe41f45
prepare invoice selection and calculation
2018-03-19 15:50:56 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7
2018-03-19 12:18:18 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
7b71e29fa0
Duplicate translation
2018-03-17 15:17:35 +01:00
Laurent Destailleur
bbb095bcb2
FIX css
2018-03-16 12:19:16 +01:00
Laurent Destailleur
07fb29f0c4
Fix var not initialized
2018-03-16 12:18:20 +01:00
Laurent Destailleur
1716ac5f44
Fix var not initialized
2018-03-16 01:05:49 +01:00
Laurent Destailleur
5a397fff72
Fix scrutinizer bugs
2018-03-16 00:16:32 +01:00
Laurent Destailleur
c83b0bd53c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-15 15:11:35 +01:00
Laurent Destailleur
c4ca4a5a16
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/install/mysql/data/llx_accounting_category.sql
2018-03-15 15:11:18 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9
...
NEW Add stats in salaries module
2018-03-15 14:28:35 +01:00
Laurent Destailleur
ce0144e645
Add code to help debug
2018-03-15 13:21:02 +01:00
Laurent Destailleur
542eb2e5f4
Comment
2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8
Fix report when group is not dedicated to a country
2018-03-15 12:31:24 +01:00
Laurent Destailleur
b379a2f83c
FIX css
2018-03-15 10:43:04 +01:00
Laurent Destailleur
d804764134
Standardize look and feel
2018-03-15 10:41:43 +01:00
Laurent Destailleur
97c8504915
Fix remove log
2018-03-15 10:26:06 +01:00
Alexandre SPANGARO
9ce6ab915c
Merge remote-tracking branch 'uptream/develop' into 8.0-a9
2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc
NEW Add stats in salaries module
2018-03-15 06:23:20 +01:00
Laurent Destailleur
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
98b7d4c2e2
NEW Can set the start/end date of service line in invoice templates
2018-03-12 12:27:40 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
Laurent Destailleur
e1654f4215
Fix division by zero
2018-03-11 21:18:18 +01:00
Laurent Destailleur
5c4b5cc74f
fix
2018-03-11 00:40:35 +01:00
Laurent Destailleur
897b3f7b79
Fix setup
2018-03-11 00:31:26 +01:00
Laurent Destailleur
390618db47
Fix bad space
2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762
Fix phpcs
2018-03-10 22:41:57 +01:00
Laurent Destailleur
dfb3d1b3bc
Merge pull request #8325 from inoveaconseil/develop
...
Add execution date on direct debit
2018-03-10 22:11:58 +01:00
Laurent Destailleur
bb835d3633
Update bonprelevement.class.php
2018-03-10 22:09:32 +01:00
Laurent Destailleur
f609547bc9
Update bonprelevement.class.php
2018-03-10 18:50:41 +01:00
Laurent Destailleur
9e0c74ca20
Update bonprelevement.class.php
2018-03-10 18:49:48 +01:00
Laurent Destailleur
b0bd8cf910
Update facture.class.php
2018-03-10 12:56:19 +01:00
Inovea Conseil
d2dff92f26
Add execution date on prelevement
2018-03-10 11:28:12 +01:00
Inovea Conseil
975300b90b
Add execution date on prelevement
2018-03-10 11:23:35 +01:00
florian HENRY
40fb803ffd
scrunitizer
2018-03-10 09:34:33 +01:00
florian HENRY
63fb53159c
fix scrunitizer
2018-03-10 01:12:47 +01:00
florian HENRY
8e84b733dc
fix scrutinizer
2018-03-10 00:13:41 +01:00
Laurent Destailleur
20ec269d4d
Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink
...
7.0 betterthirdpartylink
2018-03-09 23:03:23 +01:00
Laurent Destailleur
d8d13a7348
Merge branch 'develop' into 7.0_fix_invoicelist
2018-03-09 22:37:20 +01:00
florian HENRY
a34709c112
fix better thirdparty link
2018-03-09 22:36:00 +01:00
florian HENRY
164ca682d5
fix add "late" invoice into "save last search/backtolist" feature
2018-03-09 17:23:43 +01:00
Regis Houssin
82057b3523
Fix: use code instead id
2018-03-09 08:11:02 +01:00
Laurent Destailleur
9f42e1b172
Prepare code to introduce different payment modes than BAN
2018-03-08 22:33:40 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Regis Houssin
861a831e24
Fix: debug
2018-03-08 11:53:46 +01:00
Regis Houssin
fd9c79fa7f
Fix: use getEntity if no rowid to compare
2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Alexandre SPANGARO
0182b724aa
Merge remote-tracking branch 'uptream/develop' into 8.0-a7
2018-03-08 06:53:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb
New : On invoice card, show accounting account linked
2018-03-08 06:52:31 +01:00
Laurent Destailleur
69ef6a9316
Fix data on thirdparty tooltip
2018-03-07 19:13:54 +01:00
Laurent Destailleur
fe45e82e99
Fix use of table llx_c_paiement (param showempty was not used/set)
2018-03-07 19:00:38 +01:00
Laurent Destailleur
65c689cc81
Clean code
2018-03-07 18:32:47 +01:00
Laurent Destailleur
3287c03e67
Fix data on thirdparty tooltip
2018-03-07 18:32:25 +01:00
Laurent Destailleur
c1497b065c
CSS
2018-03-07 14:13:55 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
0dfc9af72a
FIX multicompany compatibility and fix reports
2018-03-06 19:58:13 +01:00
Laurent Destailleur
1e6a55745c
CSS
2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Laurent Destailleur
0cfa19ee09
NEW Online payment of invoice and subscription record the payment
...
automatically.
2018-03-06 00:12:23 +01:00
Laurent Destailleur
d569adea2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-05 21:46:40 +01:00
Laurent Destailleur
2f9f4d0675
WIP Create payment of member subscription with paypal
2018-03-05 21:46:24 +01:00
Alexis ALGOUD
35002cf93d
Merge branch 'develop' into NEW_price_on_stock_mvt
2018-03-05 17:45:27 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
864edce665
NEW Accept anonmymous events (no user assigned)
...
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
82fd84fb48
Fix scrutinizer errors
2018-03-04 11:22:43 +01:00
Laurent Destailleur
4137e1cc76
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-02 17:56:30 +01:00
Laurent Destailleur
6bb91dd5d2
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-03-02 17:54:42 +01:00
Laurent Destailleur
d35c5282d4
Merge pull request #8245 from enstentechnologies/7.0
...
FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php
2018-03-02 17:52:23 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Laurent Destailleur
e073fa15f7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-02 14:00:27 +01:00
Laurent Destailleur
a815326a28
Fix filters on bank entry list
2018-03-01 12:37:03 +01:00
Laurent Destailleur
54edd51847
Fix look and feel v7
2018-03-01 12:07:19 +01:00
Laurent Destailleur
822dd4778c
Fix info in tooltip
2018-03-01 12:03:50 +01:00
Laurent Destailleur
d25270a6f4
Fix ref not visible in payment link
2018-03-01 11:53:02 +01:00
Laurent Destailleur
bc04b3ee27
Fix min decimal on amount in payment page
2018-03-01 11:52:50 +01:00
Laurent Destailleur
be3e8a0e2d
FIX Look and feel v7
2018-03-01 11:52:41 +01:00
Laurent Destailleur
2368cb615f
Look and feel v8
2018-03-01 11:51:25 +01:00
Laurent Destailleur
158ef79e70
FIX Look and feel v7
2018-03-01 11:51:13 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
f7fe8ce141
Fix min decimal on amount in payment page
2018-03-01 02:53:47 +01:00
Laurent Destailleur
c190ec5a2c
Fix ref not visible in payment link
2018-03-01 02:49:44 +01:00
Laurent Destailleur
ee488ed83e
FIX invoice creation fails when next date not defined
2018-02-27 20:24:50 +01:00
Laurent Destailleur
f3c9d38f82
FIX invoice creation fails when next date not defined
2018-02-27 20:23:55 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
75cbc466d5
Fix warning
2018-02-27 19:08:38 +01:00
Laurent Destailleur
b090f0da9c
Fix warning
2018-02-27 19:07:58 +01:00
Laurent Destailleur
1907b9c52d
Fix search on dates on template invoices
2018-02-27 19:04:21 +01:00
Laurent Destailleur
7ba263c9ab
Fix search on dates on template invoices
2018-02-27 19:03:14 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
gauthier
4d05bff780
FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back
2018-02-27 12:27:25 +01:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
vabeltran
604cc5896e
FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php
...
Column 'amount_requested' in ORDER clause not exists because that column is called 'amount' now in 'prelevement_bons' table in db.
2018-02-26 12:31:40 +01:00
Laurent Destailleur
4866d63ece
Fix method getListOfPayments in the wrong class
2018-02-26 09:45:15 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
7ff94c88bd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-25 15:00:31 +01:00
Laurent Destailleur
251136bebf
Fix PHPUnit
2018-02-25 15:00:14 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity
...
FIX missing object entity in fetch
2018-02-25 12:59:38 +01:00
Regis Houssin
703d976b3b
Fix: missing object entity in fetch
2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
John
3b54afc9b2
Fix type lines import
2018-02-23 12:12:36 +01:00
John
c5b96e43c7
add new action to import order in invoice
2018-02-22 16:55:41 +01:00
John
a7a6630fad
Add popin dialog
2018-02-22 15:19:20 +01:00
Laurent Destailleur
b87feab1e3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-02-22 12:19:20 +01:00
Laurent Destailleur
bc0993d6cd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-22 12:17:25 +01:00
John
3c1803f1f2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-02-21 17:44:08 +01:00
John
f313fb925b
Add new checkbox for lines
2018-02-21 17:06:40 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
John
bd0e8506f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-02-21 11:53:16 +01:00
John
629b8e618e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-02-21 11:45:23 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Marc de Lima Lucio
d3f848b7bc
FIX: supplier credit notes: harmonize discount filters part 2
2018-02-21 09:30:39 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
John
09c5dc506a
Add html dom element and fix class
2018-02-20 17:46:32 +01:00
John
5624257a6d
add new dom html5 elements and class
2018-02-20 16:49:49 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill
...
fix the bill replacement with discounts #8028
2018-02-20 15:19:19 +01:00
John
46b235c139
add auto select model when select type on create invoice
2018-02-20 15:08:57 +01:00
Laurent Destailleur
b361877ea8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/card.php
2018-02-20 12:48:28 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Laurent Destailleur
32e8bab20d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-20 11:01:20 +01:00
Laurent Destailleur
16fca2ee35
Fix bad link
2018-02-20 10:05:11 +01:00
Marc de Lima Lucio
44b0d1ca0f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-19 17:33:20 +01:00
Marc de Lima Lucio
a66f7b8bc8
FIX: supplier credit notes: wrong discount filters
2018-02-19 17:32:59 +01:00
Laurent Destailleur
d233c152a7
Code comment
2018-02-16 14:18:05 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
John
49bad95d31
fix method exist test
2018-02-15 17:04:27 +01:00
John
63987fa32e
fix invoice extrafield transmition to credit
2018-02-15 16:39:47 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
47713e0264
Fix bug reported by scrutinizer
2018-02-15 15:32:43 +01:00
Laurent Destailleur
13dd440fd4
FIX #8192
2018-02-15 14:47:08 +01:00
Laurent Destailleur
f1a9f81fb4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-14 22:19:59 +01:00
Laurent Destailleur
4e145f0e5b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-14 22:09:12 +01:00
Laurent Destailleur
7f8cbc0f62
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/contrat/services.php
htdocs/contrat/tpl/linkedobjectblock.tpl.php
htdocs/install/upgrade2.php
2018-02-14 22:08:18 +01:00
Laurent Destailleur
06357e62da
Merge pull request #8182 from laudeco/hotfix/bank_module
...
Bank module is not accessible (error 500) since 7.0.0
2018-02-14 20:52:36 +01:00
Laurent Destailleur
3780a8b1d9
Merge branch 'develop' into new_charges_sociales_trigger
2018-02-14 20:48:16 +01:00
Laurent Destailleur
ea2e46cccd
Update chargesociales.class.php
2018-02-14 20:46:40 +01:00
Marc de Lima Lucio
4f9bb33600
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
2018-02-14 10:47:10 +01:00
atm-ph
c690dfb258
Fix apply global progress don't update multicurrency values
2018-02-14 10:15:38 +01:00
De Coninck Laurent
6f7d6f977b
fix error in latest release
2018-02-12 15:50:14 +01:00
ATM-Nicolas
d762226a70
FIX : Call to trigger on chargesociale create
2018-02-12 14:39:18 +01:00
Laurent Destailleur
fda5822d5a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 14:03:22 +01:00
Laurent Destailleur
30ba1c1702
FIX #8174
2018-02-12 14:02:51 +01:00
Laurent Destailleur
6bdb82cf27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/api_thirdparties.class.php
2018-02-12 04:15:47 +01:00
Laurent Destailleur
9b8b3a1236
Merge pull request #8176 from hregis/7.0_bug2
...
Fix: wrong param name (Travis error !)
2018-02-12 03:25:23 +01:00
Laurent Destailleur
109c447171
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 03:21:37 +01:00
Laurent Destailleur
975608b9d3
FIX #8174
2018-02-12 03:21:04 +01:00
Laurent Destailleur
fa3b1c74a9
Fix bad link
2018-02-12 02:25:34 +01:00
Laurent Destailleur
1300f7172f
NEW Can fix the bank account of a payment if payment not conciliated
2018-02-12 02:17:52 +01:00
Laurent Destailleur
1a6cff8fee
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 01:28:14 +01:00
Laurent Destailleur
b7b496132b
Fix syntax error
2018-02-12 01:27:54 +01:00
Regis Houssin
2b7693c582
Fix: wrong param name (Travis error !)
2018-02-11 12:14:23 +01:00
Laurent Destailleur
26ee7ec5be
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2018-02-08 17:27:36 +01:00
Laurent Destailleur
d10d9f0fb2
Fix scrutinizer
2018-02-08 17:22:07 +01:00
Laurent Destailleur
19a0f552c9
Fix td balance
2018-02-08 16:50:01 +01:00
Laurent Destailleur
493a9a7289
Fix td balance
2018-02-08 16:49:28 +01:00
Laurent Destailleur
a200a7f149
Fix look and feel v7
2018-02-08 16:43:10 +01:00
Laurent Destailleur
cc20a9d1d5
FIX #8079
2018-02-08 16:43:05 +01:00
Laurent Destailleur
490e093926
Fix look and feel v7
2018-02-08 16:41:50 +01:00
Laurent Destailleur
91bed7c014
FIX #8079
2018-02-08 16:13:12 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
2b2e68c78d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/societe/card.php
2018-02-08 15:18:28 +01:00
Laurent Destailleur
39cd63e2d4
Merge pull request #8143 from simnandez/6.0
...
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
2018-02-08 14:07:14 +01:00
Laurent Destailleur
ab21769aa2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/card.php
2018-02-08 12:58:47 +01:00
Laurent Destailleur
c988d3f1cc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2018-02-08 12:53:26 +01:00
Juanjo Menent
9b56555962
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
2018-02-06 18:49:29 +01:00
Laurent Destailleur
ea92f6beae
Fix for multicompany
2018-02-06 10:57:53 +01:00
Laurent Destailleur
074f4a3b46
Fix class not found when selecting project ref in lists
2018-02-06 00:34:14 +01:00
Laurent Destailleur
c2590b9c7e
Fix: complete labels of operation if bank journal
...
Conflicts:
htdocs/compta/tva/class/tva.class.php
2018-02-05 17:10:18 +01:00
Laurent Destailleur
ad384a9992
Fix default sort order
2018-02-05 17:08:47 +01:00
Laurent Destailleur
47cb9aef50
Fix: complete labels of operation if bank journal
2018-02-05 17:07:38 +01:00
Laurent Destailleur
a8ad9fb77d
Fix default sort order
2018-02-05 16:28:25 +01:00
Laurent Destailleur
51847dfa8a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2018-02-05 15:34:50 +01:00
Laurent Destailleur
85964e02de
Fix css
2018-02-05 12:34:11 +01:00
Laurent Destailleur
f229f34d05
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-05 01:34:08 +01:00
Laurent Destailleur
30c683ed65
Fix properties into tooltip
2018-02-05 00:36:54 +01:00
Laurent Destailleur
8fe773204e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/projet/card.php
2018-02-04 23:17:09 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Regis Houssin
8ee1186492
Fix: wrong test
2018-02-04 09:05:35 +01:00
Regis Houssin
d5b7184c8d
Fix: wrong test
2018-02-04 09:04:15 +01:00
Regis Houssin
a161ca37ff
Fix: use product_type instead special_code
2018-02-04 08:58:31 +01:00
Regis Houssin
c1e6d88442
Fix: use product_type instead special_code
2018-02-04 08:55:51 +01:00
Laurent Destailleur
6de2a08d70
Fix scrutinizer bugs
2018-02-03 19:10:52 +01:00
Laurent Destailleur
2e705b5a88
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:41:20 +01:00
Laurent Destailleur
d3a6342034
Fix regeneration of PDF after creation of payment.
2018-02-02 10:37:10 +01:00
Regis Houssin
38d735341c
Fix: remove lines with special code when convert to reduc
2018-02-02 10:24:16 +01:00
Regis Houssin
2147bd23e6
Fix: remove lines with special code when convert to reduc
2018-02-02 10:22:47 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
74a34acf77
Tab vs space
2018-02-01 02:14:17 +01:00
Laurent Destailleur
9c6b6f244c
Fix tooltip on invoice
2018-02-01 01:25:45 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
fec551631e
Merge pull request #8066 from grandoc/new_push_16_01_2018
...
NEW Add linked file tab to vat
2018-01-29 21:28:14 +01:00
Laurent Destailleur
e208e5b8a7
Fix look and feel v7
2018-01-29 21:27:46 +01:00
Laurent Destailleur
491e64db06
Fix various payments
2018-01-29 19:07:42 +01:00
Laurent Destailleur
4eb7d7a332
Debug blockedlog with various payments
2018-01-29 18:22:26 +01:00
Laurent Destailleur
8ae25b3c65
Fix the FACTURE_ENABLE_NEGATIVE was useless without
...
FACTURE_ENABLE_NEGATIVE_LINES
2018-01-29 16:21:54 +01:00
Laurent Destailleur
3a4ca8ae2b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-24 11:49:36 +01:00
De Coninck Laurent
53ac13c792
check on type replacement #8028
2018-01-23 18:03:29 +01:00
arnaud
c0481be8d8
FIX subject mail sepa
2018-01-23 17:01:03 +01:00
arnaud
19c616756a
FIX email sent was not in HTML
2018-01-23 12:14:22 +01:00
atm-ph
054d98a2ba
Fix each total isn't aligned on payment card
2018-01-22 17:09:17 +01:00
Laurent Destailleur
7a1a2cf90d
Fix send into ledger for bank line record. Show accounted status.
2018-01-22 04:13:29 +01:00
Laurent Destailleur
abdf587fb5
Fix link to expert accounting no visible if module off
2018-01-20 12:12:36 +01:00
De Coninck Laurent
4874d08062
fix the bill replacement with discounts #8028
2018-01-19 09:01:37 +01:00
Laurent Destailleur
d967527b58
Fix status was not refreshed
2018-01-18 18:40:01 +01:00
Laurent Destailleur
768c93a707
Fix suggested amount for direct debit order
2018-01-18 18:22:10 +01:00
Laurent Destailleur
1730feeb4f
Fix error message
2018-01-18 17:52:48 +01:00
Laurent Destailleur
57f664c0c1
Fix vat npr for template invoices
2018-01-17 19:45:23 +01:00
Laurent Destailleur
56d702e3c6
Fix missing property in tooltip
2018-01-17 16:26:24 +01:00
Laurent Destailleur
a84ed841cc
Fix creation date was not filled
2018-01-16 20:47:33 +01:00
Laurent Destailleur
26ba0a9ec2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cashdesk/index.php
htdocs/compta/index.php
htdocs/core/lib/security.lib.php
htdocs/societe/list.php
2018-01-16 20:23:32 +01:00
Philippe GRAND
cd0dc2dbde
Add linked file tab to vat
2018-01-16 16:22:32 +01:00
atm-quentin
6feacab4f5
FIX missing hook invoice index
2018-01-15 14:24:19 +01:00
Laurent Destailleur
aa1692483f
Fix colspan
2018-01-13 16:06:04 +01:00
Laurent Destailleur
d0680b429f
Fix name of file saved from tax document tab
2018-01-12 17:39:20 +01:00
Laurent Destailleur
8b972313ae
Fix scrutinizer
2018-01-12 15:38:53 +01:00
Laurent Destailleur
64ae70d106
Fix scrutinizer bug
2018-01-12 15:20:17 +01:00
Laurent Destailleur
3423d4e6d3
Fix balance is amount after, so i fix by adding amount before
2018-01-12 13:35:53 +01:00
Laurent Destailleur
95d2a9f88d
Responsive and css
2018-01-12 01:10:03 +01:00
Laurent Destailleur
b225a6f79c
Better translation
2018-01-11 20:19:53 +01:00
Laurent Destailleur
e56d74f5c4
Fix generation of doc for supplier payment
2018-01-11 19:01:47 +01:00
Laurent Destailleur
e152e81d18
Fix close code
2018-01-11 18:24:40 +01:00
Laurent Destailleur
0b893c11fd
Revert "Fix wrong address used into PDF model of supplier payment"
...
This reverts commit 22d92c0540
2018-01-11 18:09:05 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu
...
fix #7963
2018-01-11 00:44:45 +01:00
Laurent Destailleur
436b653fa0
Error report
2018-01-11 00:16:45 +01:00
Laurent Destailleur
43d560830c
Fix on old php
2018-01-10 13:20:43 +01:00
Laurent Destailleur
bc9fc2828a
Fix missing class
2018-01-10 10:42:36 +01:00
Laurent Destailleur
9f79ad800b
Fix price per quantity
2018-01-09 14:20:47 +01:00
florian HENRY
fdedd6f75b
fix 7963
2018-01-08 20:54:40 +01:00
atm-ph
22d92c0540
Fix wrong address used into PDF model of supplier payment
2018-01-08 15:25:18 +01:00
Laurent Destailleur
42e659e26c
Fix link for online payment
2018-01-08 13:21:04 +01:00
Laurent Destailleur
b9015de7e2
Fix can't edit payment mode / default bank account
2018-01-05 19:52:23 +01:00
Laurent Destailleur
70cfec37b1
Fix add of free entry into bank account
2018-01-05 17:38:21 +01:00
Laurent Destailleur
5580cedfdc
Fix add of free entry into bank account
2018-01-05 17:35:28 +01:00
Laurent Destailleur
d7837f8800
Try fix for #7778
2018-01-05 01:43:51 +01:00
Laurent Destailleur
a3c6746b6f
Merge #8008 manually
2018-01-04 23:50:15 +01:00
Laurent Destailleur
1464937c66
Merge #8008 manually
2018-01-04 23:44:21 +01:00
Laurent Destailleur
f19fb90ab0
Merge #8008 manually
2018-01-04 23:36:14 +01:00
Laurent Destailleur
300d4e1603
Fix disable direct debit request for replaced invoices
2018-01-04 14:35:02 +01:00
Laurent Destailleur
6bc8268dc5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-01-03 23:35:15 +01:00
Laurent Destailleur
534cbcb941
Debug translation
2018-01-03 20:59:35 +01:00
John
1331e8add7
fix filter for TYPE_SITUATION invoice
2018-01-02 17:19:42 +01:00
Laurent Destailleur
b0fefffcf8
Fix standardize api code
2017-12-28 12:44:15 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
bbcf70cf4e
Remove spaces
2017-12-28 09:48:41 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0
2017-12-28 08:46:22 +01:00
Laurent Destailleur
de305cb3b2
Merge pull request #7980 from hregis/6.0_bug2
...
Fix: avoid php warning
2017-12-28 06:53:09 +01:00
Ferran Marcet
1c7b99d3dc
Fix: Missing include for Project class
2017-12-26 12:13:35 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
9ea2fe226d
Fix look and feel v6
2017-12-20 19:30:30 +01:00
Laurent Destailleur
9d10eb57f2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/dolibarr_changes.txt
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/main.inc.php
2017-12-20 13:28:41 +01:00
Regis Houssin
2821459894
Fix: avoid php warning
2017-12-20 11:36:51 +01:00
Laurent Destailleur
d51ae72eb4
Merge pull request #7965 from Oeris/develop-api
...
NEW improvements of invoices, orders and proposals in the REST API
2017-12-19 18:17:48 +01:00
Laurent Destailleur
57603e3df4
Update api_invoices.class.php
2017-12-19 18:16:39 +01:00
Laurent Destailleur
bffed79132
Update api_invoices.class.php
2017-12-19 18:06:05 +01:00
Laurent Destailleur
29b9fb6f54
Merge pull request #7964 from aspangaro/8.0-a1
...
NEW : Add search on date and accounting account in various payment list
2017-12-19 17:58:26 +01:00
Neil Orley
a3f4066790
NEW Update bank account when updating an invoice
...
Add the ability to update the bankaccount when updating an invoice
2017-12-19 14:14:26 +01:00
Neil Orley
fe8fac9577
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-19 12:36:46 +01:00
Laurent Destailleur
fcf04c122f
Fix phpcs
2017-12-19 00:39:01 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Neil Orley
ee6b0d7237
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-18 14:36:29 +01:00
Laurent Destailleur
98b82d712a
NEW Revenue stamp can be a percent
...
FIX Revenue stamp not visible on the transfer payment page
2017-12-18 12:43:03 +01:00
Laurent Destailleur
8e12551f17
Fix not employee must not appear on page to create salaries
2017-12-18 11:55:34 +01:00
Laurent Destailleur
a020dbf3d7
Merge pull request #7953 from atm-ph/fix_6.0_checkbox_credit_note
...
Fix since jquery 3 we can check all checkbox of credit note options
2017-12-16 01:13:55 +01:00
Laurent Destailleur
9cdf322bfb
Fix scrutinizer bugs
2017-12-15 22:14:28 +01:00
Laurent Destailleur
8bb89f6bf4
Fix look and feel v6
2017-12-15 17:24:36 +01:00
Laurent Destailleur
5ae13ea9d6
Fix navigation in bank direct debit orders
2017-12-15 17:05:01 +01:00
Neil Orley
e61d625577
FIX error message
2017-12-15 10:02:23 +01:00
Neil Orley
5ae74f8ae1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-12-15 09:56:02 +01:00
Alexandre SPANGARO
24ae3d5879
NEW : Add search on date and accounting account in various payment list
2017-12-15 07:04:05 +01:00
atm-ph
a2f4afbf88
Fix wrong or missing char for url
2017-12-13 16:17:22 +01:00
atm-ph
46770178d2
Fix since jquery 3 we can check all checkbox of credit note options
2017-12-13 15:24:09 +01:00
Laurent Destailleur
676e5a1bca
Merge pull request #7943 from aspangaro/7.0-b4
...
FIX : Various payment
2017-12-12 14:54:44 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
9314dcb046
Fix regression
2017-12-12 10:13:48 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
48499fb506
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-11 15:21:22 +01:00
Alexandre SPANGARO
7b935a96bf
FIX : Various payment
2017-12-11 07:03:37 +01:00
Laurent Destailleur
dbd96d1ac7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
2017-12-10 21:46:23 +01:00
Laurent Destailleur
d836d68801
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-12-10 21:29:35 +01:00
Laurent Destailleur
f7b663379a
Fix PHP 7.2
2017-12-10 21:04:59 +01:00
Laurent Destailleur
3415ce4664
Merge pull request #7938 from aspangaro/7.0-b3
...
FIX : Debug various_payment
2017-12-10 20:59:45 +01:00
Maxime Kohlhaas
12d0928244
Fix display error message when stock not enough on invoice validation
2017-12-10 19:59:56 +01:00
Laurent Destailleur
02d9e93ed4
Fix badge and use of data-html instead of html tag
2017-12-10 15:46:35 +01:00
Laurent Destailleur
4443c0f0a0
Fix style
2017-12-10 15:24:47 +01:00
Alexandre SPANGARO
ac95ccd872
FIX : Debug various_payment
2017-12-10 14:05:36 +01:00
Laurent Destailleur
701ae7d21b
Fix responsive
2017-12-08 20:15:28 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
f85e79e250
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
2017-12-08 13:13:53 +01:00
Laurent Destailleur
b671edb116
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-08 13:10:30 +01:00
Laurent Destailleur
09d3db145b
Merge
2017-12-08 13:10:13 +01:00
Regis Houssin
1b16eb731d
Fix: missing load product translation file
2017-12-08 11:00:23 +01:00
Regis Houssin
1bdffa961f
Fix: wrong translation if multilang activated
2017-12-08 10:41:14 +01:00
Regis Houssin
04327189f7
Fix: access error when user not right to view all customers
2017-12-08 09:41:33 +01:00
Regis Houssin
c4b2c3e697
FIXME $accounts[$bid] is a label !
2017-12-08 09:17:12 +01:00
Regis Houssin
8e1a9064cb
Fix: avoid warning again
2017-12-08 09:00:05 +01:00
Regis Houssin
95fa183fac
Fix: Avoid warning "A non-numeric value encountered"
2017-12-08 08:49:03 +01:00
Laurent Destailleur
98149ae316
Fix regression
2017-12-06 23:31:42 +01:00
Laurent Destailleur
56b0279ed7
Fix translation
2017-12-05 20:46:36 +01:00
Laurent Destailleur
2c19c0a10e
Fix test
2017-12-05 20:16:28 +01:00
Laurent Destailleur
21ba8509c9
Merge pull request #7910 from ATM-Nicolas/6.0_fix_project_conf
...
NEW link project from other company conf
2017-12-05 19:18:07 +01:00
Laurent Destailleur
5ab7fa7422
Fix location on good page
2017-12-05 15:48:24 +01:00
Laurent Destailleur
3a9bf455e2
FIX #7870
2017-12-05 13:38:24 +01:00
Laurent Destailleur
93311e3817
FIX #7885
2017-12-05 12:31:57 +01:00
ATM-Nicolas
bdf1e30ef3
Merge branch 'develop' into 6.0_fix_project_conf
2017-12-05 12:20:48 +01:00
Laurent Destailleur
8019f73f99
Fix: protection to not delete invoice if invoice is in bookkeeping
2017-12-05 10:01:30 +01:00
Laurent Destailleur
9b5f7099f7
Code comment
2017-12-03 19:50:15 +01:00
Laurent Destailleur
1b3680c200
Fix missing css
2017-12-03 12:21:38 +01:00
Laurent Destailleur
11286dee4a
Delete of payment
2017-12-03 11:59:16 +01:00
Laurent Destailleur
1f4a079f01
Fix bug reported by scrutinizers
2017-12-02 15:03:14 +01:00
Laurent Destailleur
38be224665
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-02 14:14:26 +01:00
Laurent Destailleur
29568287ef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-12-02 14:13:44 +01:00
Laurent Destailleur
5fae19b4d6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-12-02 14:13:29 +01:00
Laurent Destailleur
c7d0e917fb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-12-02 14:12:43 +01:00
Laurent Destailleur
9cafb08759
Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total
...
Fix product type is ignored and can generate a diffrent result with s…
2017-12-02 14:06:25 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
gauthier
f04af6c1b3
FIX : test for filter fk_status
2017-11-29 11:06:33 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
...
factorization of extrafields into list
2017-11-28 12:14:47 +01:00
Laurent Destailleur
ef786f2271
Debug accountancy module
2017-11-28 11:31:55 +01:00
Laurent Destailleur
a9d3e90b70
Big debug of accountancy module
2017-11-27 21:53:22 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
807bfbb696
Merge pull request #7867 from frederic34/bank
...
info bank
2017-11-27 14:50:00 +01:00
atm-ph
5fef6478a5
Fix wrong calcul_price_total() update
2017-11-27 11:26:41 +01:00
Laurent Destailleur
5bdb7d1b98
Fix line "none" must not be visible if there is lines
2017-11-25 23:28:00 +01:00
Laurent Destailleur
6a9056a924
Fix line "none" must not be visible if there is lines
2017-11-25 23:26:14 +01:00
Laurent Destailleur
e99f190ff1
Save search context on list of template invoices
2017-11-25 15:56:36 +01:00
Laurent Destailleur
dbcb38dd3b
Use short label on table
2017-11-25 15:13:39 +01:00
Laurent Destailleur
1d97dd2bd8
NEW can filter on status of template invoices
2017-11-25 15:08:19 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Frédéric FRANCE
6a91b16995
info bank
2017-11-25 12:13:03 +01:00
Laurent Destailleur
aaf08ade2f
Fix bug reported by scrutinizer
2017-11-25 11:21:31 +01:00
Laurent Destailleur
412c4e335d
Fix method of herited object has same signature than parent
2017-11-25 11:10:52 +01:00
Laurent Destailleur
4f4f929efb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
2017-11-24 17:02:14 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
5cf21fef05
Use autocompletion on list of taxes
2017-11-23 15:46:52 +01:00
Laurent Destailleur
6a3dc91414
Standardize code
2017-11-23 15:22:32 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
5a2fe13958
Fix travis
2017-11-22 21:36:01 +01:00
atm-ph
219e58d0e4
Fix product type is ignored and can generate a diffrent result with situation invoice
2017-11-22 12:15:02 +01:00
ptibogxiv
16e791913f
Fix import date
...
fix import date when creation
2017-11-19 21:56:50 +01:00
ptibogxiv
35182066a8
update createfromorder
...
lack of 2 fields date_start and date_end not imported from order
2017-11-19 16:25:35 +01:00
Laurent Destailleur
f284cd6c0f
Fix phpcs
2017-11-18 02:15:56 +01:00
Laurent Destailleur
14946a0dfa
Fix sort on status
2017-11-18 02:14:04 +01:00
Laurent Destailleur
a00353f332
Fix link to create invoice from template on list
2017-11-18 02:07:52 +01:00
Laurent Destailleur
fc1441086c
Fix status in template invoice
2017-11-18 02:01:04 +01:00
Laurent Destailleur
03cc685037
NEW Add a status enabled/disabled on recurring invoices
2017-11-18 00:54:23 +01:00
Laurent Destailleur
cf0d67d71c
Generation of pdf become default value
2017-11-17 23:57:32 +01:00
Laurent Destailleur
77a0762fc1
Fix comment
2017-11-17 15:07:32 +01:00
Laurent Destailleur
2f6dfc2387
Merge pull request #7800 from atm-maxime/new_deposit_convert_unpaid
...
NEW deposits can be converted even if unpaid
2017-11-17 15:05:33 +01:00
Laurent Destailleur
ead629708c
Look and feel v6
2017-11-17 14:57:14 +01:00
Laurent Destailleur
92753273b9
Fix upload api for invoices and bad id for bank account
2017-11-17 11:44:52 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Neil Orley
8e869688f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-11-15 10:42:00 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Neil Orley
9b2611933d
NEW Create an invoice using an existing order
...
Create an invoice using an existing order using the REST API
2017-11-14 15:49:09 +01:00
Neil Orley
e513ed09f6
Change the way pa_ht is calculated
2017-11-14 14:43:50 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
1a5bbef266
FIX Locatax were not propagated when cloning order or proposal
2017-11-13 13:07:31 +01:00
Laurent Destailleur
f33182acc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-12 20:49:53 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
d29233f553
Merge pull request #7801 from atm-maxime/fix_multi_vat_deposit
...
Fix multi VAT deposit when special lines are in origin document
2017-11-11 18:03:31 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf
...
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Laurent Destailleur
50ed463b9f
Merge pull request #7784 from frederic34/patch-3
...
account number on create bank account
2017-11-11 17:37:29 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Maxime Kohlhaas
22a3721dda
Fix multi VAT deposit when special lines are in origin document
2017-11-11 16:10:06 +01:00
Maxime Kohlhaas
60fcddb9e4
NEW deposits can be converted even if unpaid
2017-11-11 12:07:55 +01:00
Laurent Destailleur
11cc82e6d2
Update doc
2017-11-10 10:15:50 +01:00
Frédéric FRANCE
5621e85c00
comment
2017-11-10 00:26:01 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs
2017-11-09 23:39:28 +01:00
Frédéric FRANCE
1ea6df14d0
Update card.php
2017-11-08 11:35:15 +01:00
Frédéric FRANCE
27ace14fb7
Fetch right account
2017-11-07 16:28:51 +01:00
Laurent Destailleur
e7abc92f97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
2017-11-06 21:37:19 +01:00
Laurent Destailleur
1d9873e1a9
FIX #7756 Add better error message
2017-11-06 21:17:30 +01:00
Laurent Destailleur
9cc923f317
Fix for ch accounting account.
2017-11-06 21:12:29 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
a329f7dc75
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
2017-11-05 18:50:14 +01:00
Laurent Destailleur
21a0f11395
Merge pull request #7760 from Oeris/develop-api
...
NEW Adds the payment reference to the return of the function getListOfPayements
2017-11-05 18:29:59 +01:00
Laurent Destailleur
d3a0cff30a
Merge pull request #7755 from frederic34/currency
...
default currency on propal create
2017-11-05 18:28:40 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
Neil Orley
3ecccadb8b
NEW Adds the payment reference to the return of the function getListOfPayements
...
Adds the payment reference to the return of the function getListOfPayements
2017-11-03 13:04:23 +01:00
Frédéric FRANCE
b58df17545
default currency on propal create
2017-11-02 18:14:55 +01:00
Laurent Destailleur
309e83a946
Remove the "add" in addpayment. Action in API is hosted by the method
2017-11-02 16:06:44 +01:00
Laurent Destailleur
36f7f32205
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-02 16:02:24 +01:00
Laurent Destailleur
d70f9e053e
Remove the get in url. The GET is already in the method.
2017-11-02 16:01:13 +01:00
Laurent Destailleur
93ab4cadff
Merge pull request #7753 from Oeris/develop-api
...
NEW Add REST API to add payment line to a specific invoice
2017-11-02 15:54:22 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Neil Orley
5febdf7bae
NEW Add payment line to a specific invoice using the REST API
...
Add payment line to a specific invoice using the REST API
2017-11-02 15:01:38 +01:00
Frédéric FRANCE
01a3787664
swap llxfooter() and $db->close()
2017-10-31 13:45:13 +01:00
Laurent Destailleur
068f5e32cb
NEW Tooltip for substitutions variables on tooltips on admin pages
2017-10-31 11:17:44 +01:00
Laurent Destailleur
75bbcdf575
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-29 11:29:01 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Neil Orley
9a1c684870
FIX wrong paramters name in the usecreditnote method
...
Rename 'creditnoteid' with 'discountid' in the URI
Rename 'creditId' with 'discountid' in the method
2017-10-27 10:02:17 +02:00
Laurent Destailleur
ee1996ad37
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2017-10-27 01:16:51 +02:00
Laurent Destailleur
740c89365d
Code comment
2017-10-27 00:42:44 +02:00
Laurent Destailleur
6a9837528e
Merge pull request #7703 from Oeris/develop-api
...
FIX Data related to customer moved to thirparties api
2017-10-27 00:42:10 +02:00
Laurent Destailleur
f4a06aef3f
Update api_invoices.class.php
2017-10-27 00:36:06 +02:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Neil Orley
da0a205a10
NEW Deduct an available credit to an existing invoice
...
Deduct an available credit to an existing invoice using the REST API
2017-10-25 17:09:37 +02:00
Neil Orley
3e53a2ecff
FIX merging conflict
2017-10-25 14:52:33 +02:00
Neil Orley
ff760eb8d5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api
2017-10-25 14:46:44 +02:00
Neil Orley
257acb6679
NEW Insert a discount in a specific invoice using the REST API
...
Add ability to insert a discount in a specific invoice.
2017-10-25 14:41:12 +02:00
Neil Orley
ec6a19a123
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api-down-payments
2017-10-25 09:57:53 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
3f4c2b54d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-24 15:22:59 +02:00
Laurent Destailleur
7b661685cc
Debug modBlockedLog module
2017-10-24 15:22:46 +02:00
Neil Orley
b4c484cf0b
NEW Get available assets of an invoice using the REST API
...
Returns a list of paid down-payments, available avoirs, etc. with the payments detail
2017-10-24 14:29:28 +02:00
Laurent Destailleur
576db84445
Merge pull request #7701 from mistraloz/patch-2
...
Feature Request : Name of invoice when they are Draft (instead of "Pr…
2017-10-24 13:06:33 +02:00
Laurent Destailleur
e9d851ef34
Merge pull request #7691 from Oeris/develop-api
...
NEW Retrieves available discounts and payments details from a specific invoice
2017-10-24 12:49:55 +02:00
Laurent Destailleur
8592e1b1e8
Update api_invoices.class.php
2017-10-24 12:49:37 +02:00
Laurent Destailleur
b6825703b4
Update api_invoices.class.php
2017-10-24 12:47:15 +02:00
Laurent Destailleur
2a1280c715
Merge pull request #7661 from atm-ph/fix_6_0_no_hook_recap_compta
...
NEW External module can interact with the customer summary page
2017-10-24 12:39:31 +02:00
Neil Orley
c34a6db13a
Rename assets with avoirs
2017-10-24 11:53:39 +02:00
Neil Orley
41104de7ce
NEW Get available assets of an invoice using the REST API
...
Returns a list of paid down-payments, available avoirs, etc. with the payments detail
2017-10-24 11:47:25 +02:00
Neil Orley
02c8f7f905
Modify rights check in the getPayments method
2017-10-24 11:25:31 +02:00
mistraloz
36adda92c2
Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669
...
Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669
-> Change only the tooltip with ref_supplier or ref_client
2017-10-24 11:17:02 +02:00
Neil Orley
0a43a12420
NEW Get a payment list of a given invoice using the REST API
...
Add the getpayments method to retrieve a list of payments of a given invoice
2017-10-24 10:50:38 +02:00
Neil Orley
2a9ddf7437
Remove whitespace
2017-10-23 16:49:00 +02:00
Neil Orley
bd0079b3f1
NEW Retrieve available discounts and payments details from an invoice
...
Adds the ability to get availbales discounts and payments details of a specific invoice unsing the REST API.
2017-10-23 16:45:49 +02:00
atm-ph
c8871bffc9
Fix duplicate html id
2017-10-23 09:01:58 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
78ffe15a04
Code comment
2017-10-22 14:03:59 +02:00
Laurent Destailleur
83c1928034
Fix duplicate methods
2017-10-22 12:21:44 +02:00
Laurent Destailleur
c9fceaad3c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/index.php
htdocs/fourn/facture/card.php
2017-10-22 04:04:26 +02:00
Laurent Destailleur
728e36f70f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
Frédéric FRANCE
735f06fd83
FIX #7675
2017-10-21 16:20:06 +02:00
Laurent Destailleur
1202853001
Fix syntax error
2017-10-19 19:12:00 +02:00
Laurent Destailleur
f7556e7ad2
FIX make of link to other object during creation
2017-10-19 19:06:48 +02:00
Laurent Destailleur
d4ade7b935
FIX API to get object does not return data o flinked objects
2017-10-19 17:57:16 +02:00
TuxGasy
9c3805c0d5
Fix anchor after add line
2017-10-19 14:10:58 +02:00
Laurent Destailleur
cb089987ee
Fix code comment
2017-10-19 12:35:15 +02:00
Laurent Destailleur
93d16bf4d7
Fix several fixes in APIs
2017-10-19 12:30:36 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
atm-ph
0f35b361bc
Fix can't interact with recap data page
2017-10-19 10:42:11 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
99239cbb38
Add API close to close an order
2017-10-18 15:34:03 +02:00
Laurent Destailleur
d40dda83cf
Add API "close" for proposals
...
Standardize code
2017-10-18 11:10:08 +02:00
Laurent Destailleur
d70c215ab8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/fourn/facture/card.php
2017-10-17 11:14:58 +02:00
Laurent Destailleur
81e7f45200
FIX Stats on invoices show nothing
2017-10-17 11:08:49 +02:00
Laurent Destailleur
5937fba373
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-10-17 10:51:11 +02:00
Laurent Destailleur
8b140ab069
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-17 10:44:29 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Laurent Destailleur
3b1b83a046
Look and feel v6
2017-10-16 20:53:23 +02:00
Laurent Destailleur
0b83513fe0
Merge pull request #7635 from papoteur-mga/develop
...
Add Autofill button for amount to pay in charge payment page
2017-10-16 20:26:53 +02:00
Laurent Destailleur
45ac8367bd
NEW Add API for contracts
2017-10-16 17:56:59 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Papoteur
75835dd7fd
Add Autofill button for amount to pay in charge payment page
2017-10-15 13:33:48 +02:00
Laurent Destailleur
b491d22c16
FIX selection of thirdparty was lost on stats page of invoices
2017-10-14 02:30:33 +02:00
Laurent Destailleur
56e27d785a
CSS on report
2017-10-14 01:03:59 +02:00
Laurent Destailleur
b90770c30c
NEW Can rename (so reorder) bank receipts
2017-10-13 23:38:57 +02:00
Laurent Destailleur
d06f260b94
Fix amount format
2017-10-13 23:13:26 +02:00
Laurent Destailleur
07d16afe3b
Save one space
2017-10-13 23:10:40 +02:00
Laurent Destailleur
c014786446
NEW On reconciliation, show balance including all reconciliated fields
2017-10-13 23:07:27 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
4b43faf0c1
Fix lose filter
2017-10-13 21:44:38 +02:00
Laurent Destailleur
5a4480bd1d
Fix navigation on bank receipts
2017-10-13 21:32:14 +02:00
Laurent Destailleur
afd83a4454
Fix navigation on bank receipts
2017-10-13 21:25:27 +02:00
Laurent Destailleur
c28dec8dc2
Fix balance no more visible
2017-10-13 21:04:20 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5
Fix from scrutinizer
2017-10-13 13:10:36 +02:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
857b59409c
FIX sql syntax error because of old field accountancy_journal
2017-10-13 01:50:00 +02:00
Laurent Destailleur
558f261b60
FIX #7593
2017-10-13 01:03:33 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
45b4572ad4
Label shorter
2017-10-12 13:30:28 +02:00
gauthier
1e7676d26f
FIX : wrong key in selectarray
2017-10-12 09:30:04 +02:00
Laurent Destailleur
ca0af5cddf
NEW Bulk action validate on customer invoices
2017-10-12 02:25:17 +02:00
Laurent Destailleur
1d92e80788
Fix line addr in xml sepa file
2017-10-12 02:07:51 +02:00
Laurent Destailleur
08c94f11b6
FIX SEPA file if address is empty
2017-10-12 01:44:26 +02:00
Laurent Destailleur
dd15884f83
Fix recur - rcur
2017-10-12 01:35:04 +02:00
Laurent Destailleur
7c29bb5818
Fix must use differently FRST and SEPA
2017-10-12 01:24:19 +02:00
Laurent Destailleur
5f401839d6
Fix verif
2017-10-12 00:42:48 +02:00
Laurent Destailleur
15bcbc8b43
FIX Check on bank info for sepa must be done on iban/swift not on ban
2017-10-12 00:38:59 +02:00
Laurent Destailleur
31ab73ff3c
Fix when verif is called several times
2017-10-12 00:12:26 +02:00
Laurent Destailleur
56e437a6c3
Bed fetch
2017-10-12 00:03:24 +02:00
Laurent Destailleur
5715f44fe6
Better error messages
2017-10-12 00:02:24 +02:00
Laurent Destailleur
d36af4a46a
RUM number start with RUM-
2017-10-11 23:06:23 +02:00
Laurent Destailleur
b4018846e8
Merge pull request #7610 from atm-arnaud/FIX_search_conciliated_bankentries
...
FIX bankentries search conciliated if val 0
2017-10-11 11:54:21 +02:00
arnaud
fd796723f2
FIX bankentries search conciliated if val 0
2017-10-10 17:15:01 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Laurent Destailleur
8f24a86352
NEW If max nb of generation is reached, date for next gen is striked
2017-10-09 14:16:22 +02:00
Laurent Destailleur
4c23363400
Fix creation of tax payment
2017-10-07 21:27:18 +02:00
Laurent Destailleur
ad0fa3c33a
Look and feel v6
2017-10-07 21:13:54 +02:00
Laurent Destailleur
8aa924fa08
NEW The bank account is visible on payment of taxes
2017-10-07 21:03:46 +02:00
Laurent Destailleur
e40bffb0d5
Fix bug reported by scrutinizer
2017-10-07 20:21:47 +02:00
Laurent Destailleur
af1d2bfffd
Standardize code
2017-10-07 14:11:01 +02:00
Laurent Destailleur
762879b95b
Merge pull request #7586 from Dolibarr/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2017-10-07 13:39:39 +02:00
Laurent Destailleur
1b399dc8dd
Update api_invoices.class.php
2017-10-07 13:28:04 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Neil Orley
925a86b2ba
NEW Delete a line of invoice using the REST API
...
Adds the ability to delete a line of an invoice using the REST API
Rename a post action with a "verb"
2017-10-06 20:49:58 +02:00
Laurent Destailleur
f9d9642340
FIX #6981
2017-10-06 14:07:28 +02:00
Laurent Destailleur
06b18a740e
NEW Add date of birth on user card.
...
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
7b1fe6e5af
Look and feel v6
2017-10-06 11:02:44 +02:00
Laurent Destailleur
d28188d19d
FIX Generation of invoice from bulk action "Bill Orders"
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3
FIX Generation of invoice from bulk action "Bill Orders"
2017-10-04 14:27:10 +02:00
Laurent Destailleur
436ec93084
FIX is_erasable report bad value when thirdparty was not loaded
2017-10-04 03:22:41 +02:00
Laurent Destailleur
a6cf934973
Add log
2017-10-04 02:46:01 +02:00
Laurent Destailleur
3a41f2bddb
Fix test when numbering ref is only numeric char.
2017-10-04 01:27:19 +02:00
Laurent Destailleur
c08f33507f
More accurate error code
2017-10-04 00:51:25 +02:00
Laurent Destailleur
8794e54eba
Try to fix phpunit
2017-10-03 22:52:57 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
b40012d08f
Merge pull request #7535 from Oeris/develop-api
...
NEW Set invoices as draft using the REST API
2017-10-03 16:46:12 +02:00
Laurent Destailleur
2b2832da22
Add option FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES - Close #7548
2017-10-03 16:38:22 +02:00
Laurent Destailleur
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +02:00
Laurent Destailleur
9d6498f2a4
NEW Search filters in lists are restored when using "back to list"
2017-10-03 14:50:52 +02:00
Regis Houssin
e65b21a3bf
Fix: change the parameter value of dol_getIdFromCode
2017-10-02 11:59:17 +02:00
Neil Orley
503129c9f4
Rename method draft and paid to settodraft and settopaid
2017-10-02 11:51:54 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Neil Orley
5b91a6a37b
NEW Sets an invoice as paid using the REST API
...
Adds the ability to set an invoice as paid using the REST API
2017-10-02 11:17:46 +02:00
Neil Orley
91a1d6c17e
NEW Set invoices as draft using the REST API
...
Adds the ability to set an invoice status as draft using the REST API
Change response when validating an invoice: before returned 200 + text message, now returns an invoice object
2017-10-02 10:55:34 +02:00
Laurent Destailleur
884fc5d249
Update facture.class.php
2017-10-02 01:25:00 +02:00
Laurent Destailleur
3f3a5e0921
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
...
New custom meteo
2017-10-02 00:48:52 +02:00
AXeL-dev
46800afac9
FIX: missing variables in payment form
2017-10-01 18:38:08 +01:00
AXeL-dev
5df0f4c2fd
FIX: in payment form, label does not fill with GET method
2017-10-01 18:33:22 +01:00
Laurent Destailleur
fa6c3eff80
More PHPunit on invoice deletion
2017-09-30 12:53:24 +02:00
Regis Houssin
4a63e6b6ec
Fix: two errors when you create invoice from shipping
2017-09-29 19:07:13 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
Laurent Destailleur
be60e66d62
Uniformsize code/options
2017-09-27 16:29:33 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
7178bf0132
Work on direct external link for dolibarr objects
2017-09-26 16:56:33 +02:00
gauthier
d270a8e009
FIX : same than precedent commit
2017-09-26 16:09:40 +02:00
gauthier
8de9c5cd36
FIX : forgotten php doc on function parameter
2017-09-26 14:18:26 +02:00
gauthier
7f938bc517
NEW : unexistant function load_state_board() on several objects
2017-09-26 12:32:58 +02:00
Laurent Destailleur
49982b36ac
FIX #7490
2017-09-26 11:55:19 +02:00
Laurent Destailleur
dc362fcd30
NEW Can show currency in list of bank accounts
2017-09-25 18:11:03 +02:00
Laurent Destailleur
fcdbc66bb1
Merge pull request #7122 from atm-florian/develop_fixtransfert
...
NEW : Can transfer from bank account to bank account with different currencies
2017-09-25 17:36:52 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
3f9cae745c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-24 23:40:57 +02:00
Laurent Destailleur
af384f14ae
FIX #7477
2017-09-24 23:40:42 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
ddefdd12fb
Merge pull request #7460 from dvasseur/develop
...
FIX: REST API, date field not used for invoices creation
2017-09-24 21:56:41 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Neil Orley
9498fca5e1
Add of implementation notes with an exemple
2017-09-22 12:24:42 +02:00
Neil Orley
1aedc4a793
Change the term 'order' by 'invoice'
2017-09-22 12:18:11 +02:00
Neil Orley
ad6778a1cf
NEW post lines of an invoice using the REST API
...
Adds the ability to post a new lins in an invoice using the REST API
2017-09-22 12:08:11 +02:00
Neil Orley
f985b1ede6
NEW GET lines of an invoice in the REST API
...
Adds the ability to get lines of an invoice using the REST API
2017-09-22 12:00:54 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Laurent Destailleur
9875d20eaf
Add more columns in list of invoices templates
2017-09-21 18:35:47 +02:00
David
9dab694bb0
FIX: REST API, date field not used for invoices creation
2017-09-21 17:48:12 +02:00
Laurent Destailleur
68c9d08909
Merge pull request #7438 from fappels/6.0_fix_extrafields_copy
...
FIX extrafields copy situation invoice, shipment and receipt
2017-09-20 17:36:48 +02:00
Laurent Destailleur
577c64cc37
WIP work on param download on payment page
2017-09-20 17:23:36 +02:00
Laurent Destailleur
04e1458a3f
Fix clean parameters
2017-09-19 22:03:44 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
Laurent Destailleur
6a0ef4b561
Fix info ot total in direct debit page
2017-09-19 19:29:00 +02:00
Laurent Destailleur
f87614e2d3
Fix missing translation
2017-09-19 19:12:54 +02:00
Laurent Destailleur
ffe2ee8232
Standardize code
2017-09-19 19:00:28 +02:00
fappels
8123562ded
Fix extrafield copy next situation invoice
2017-09-19 18:42:29 +02:00
Laurent Destailleur
f936b17d68
FIX Protection to avoid to apply credit note discount > remain to pay
2017-09-19 00:24:52 +02:00
Laurent Destailleur
9838199de1
FIX Sign of amount in origin currency on credit note created from lines
2017-09-18 23:53:17 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
291a0d46e6
Fix edit of categories
2017-09-18 01:39:39 +02:00
Laurent Destailleur
3f7b705674
Use correct term accounting for codes
2017-09-18 00:48:09 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
b4eab24490
Add project into list of customer orders
2017-09-16 20:32:28 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
e56b41c1ae
Clean code
2017-09-16 13:28:13 +02:00
Laurent Destailleur
ad40d27324
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2017-09-16 12:11:18 +02:00
Laurent Destailleur
4e7e6cc658
Fix W3C
2017-09-16 09:15:10 +02:00
Laurent Destailleur
59f644a3e2
FIX SEPA recording payment must save one payment in bank per customer
2017-09-15 18:39:10 +02:00
Regis Houssin
cbd8cb8cb7
Fix: missing merge conflict
2017-09-15 17:32:49 +02:00
Laurent Destailleur
17eec5f9e9
Fix look and field for direct debit notes
2017-09-15 17:23:41 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
f5d2283093
USe second parameter in GETPOST
2017-09-15 10:52:53 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
8392158ee3
Update remisecheque.class.php
2017-09-14 12:06:41 +02:00
Stéphane BERTHELOT
93defa5f59
Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)
2017-09-14 12:06:25 +02:00
Laurent Destailleur
165c3ac112
Merge pull request #7374 from EmisFR/develop
...
Fix dates in commande and remisecheque for PostgreSQL
2017-09-14 12:05:51 +02:00
Laurent Destailleur
1cab73b605
Update remisecheque.class.php
2017-09-14 12:05:34 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
38621b622e
Fix specimen not complete for multicompany
2017-09-13 20:11:51 +02:00
Laurent Destailleur
58b49f9a08
Fix position of field to avoid errors
2017-09-13 17:10:23 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +02:00
Laurent Destailleur
c5961d8386
Pass user to the delete function
2017-09-12 14:34:33 +02:00
Laurent Destailleur
531ebc4c48
Fix merge
2017-09-12 13:53:55 +02:00
Laurent Destailleur
f411476718
Fix default value of filter
2017-09-12 13:52:19 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
3001ee5fe7
Fix title of reports
2017-09-12 13:05:34 +02:00
Laurent Destailleur
d0a0bf57b6
NEW The "Show detail by account" accepts 3 values: yes, no, if non zero
2017-09-12 12:52:48 +02:00
Laurent Destailleur
627dd15b44
Suggested link for online payment use the generic link
2017-09-12 12:18:26 +02:00
Laurent Destailleur
cda8c6e41a
Fix ref must be 50
2017-09-12 11:51:51 +02:00
Stéphane BERTHELOT
66f671f4c8
Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)
2017-09-11 18:01:24 +02:00
Laurent Destailleur
44405e5415
Fix #7335 #7365 Better fix
2017-09-11 15:04:29 +02:00
Laurent Destailleur
646e8713f2
Remove duplicated logs
2017-09-11 13:41:40 +02:00
Laurent Destailleur
b87ce172c3
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2017-09-11 13:40:34 +02:00
Laurent Destailleur
59ab52c718
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2017-09-11 13:39:03 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
9253207842
NEW template invoices support substition key
...
__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__
__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__
2017-09-11 02:11:31 +02:00
Laurent Destailleur
26385fa10d
FIX Clean bad parameters when inserting line of template invoice
...
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
2017-09-11 01:06:48 +02:00
Laurent Destailleur
86b28a01c7
FIX Clean bad parameters when inserting line of template invoice
2017-09-11 01:04:53 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
fappels
7c743eb7da
Rename $extrafields because already used
2017-09-07 21:04:15 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
7a6f3d899c
Fix initial data
2017-09-06 19:21:46 +02:00
fappels
f5e14c9d70
Transfer of customer order line extrafield should only transfer fields available in target
2017-09-05 21:41:49 +02:00
Laurent Destailleur
48c526f87d
Debug report for accounting module
2017-09-05 12:53:25 +02:00
Laurent Destailleur
f23a681dc0
Clean code
2017-09-05 10:16:08 +02:00
Laurent Destailleur
a0cdf784da
Standardize code
2017-09-05 09:43:22 +02:00
Laurent Destailleur
c1d31c34cd
Work on reports per date
2017-09-05 02:26:23 +02:00
Laurent Destailleur
e1fa37f7ff
Work on reports per date
2017-09-05 02:13:02 +02:00
Laurent Destailleur
987303a6ca
Nb of sql requests divided by 2 from report per personalized categories
2017-09-05 02:12:37 +02:00
Laurent Destailleur
1154f871f1
Update fiche-rec.php
2017-09-04 10:52:49 +02:00
Laurent Destailleur
084ea049d8
Minor bugs
2017-09-03 16:07:21 +02:00
Marcos García
ac7f1035e1
FIX #7325 Default VAT rate when editing template invoices is 0%
...
Close #7325
2017-09-03 12:25:27 +02:00
Laurent Destailleur
a3d5d97d05
Fix translation
2017-09-03 02:19:38 +02:00
Laurent Destailleur
cf5c34c8fb
Remove useless link
2017-09-03 02:13:55 +02:00
Laurent Destailleur
7f7b4cddb4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-02 12:37:02 +02:00
Laurent Destailleur
a6a5602572
NEW Can set email of thirdparty as unique and/or mandatory
2017-09-02 12:36:53 +02:00
Laurent Destailleur
c1e54b7e23
Merge pull request #7315 from aspangaro/7.0-f2
...
NEW Add project on a various payment
2017-09-02 00:45:36 +02:00
Laurent Destailleur
9fe5eb3c87
Fix double translation
2017-09-02 00:33:18 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
ac08dec2c3
Avoid warnings
2017-09-01 15:20:29 +02:00
Alexandre SPANGARO
c4d2ca661f
Merge remote-tracking branch 'uptream/develop' into 7.0-f2
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-01 07:24:55 +02:00
Alexandre SPANGARO
84fcbb724e
Add project on various_payment
2017-09-01 07:21:27 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64
Uniformize code of accounting report
2017-08-31 15:44:36 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
c028771ad0
Merge pull request #7306 from aspangaro/6.0-rc_p2
...
Fix: Bank index | Accountancy journal, fetch on rowid, not code
2017-08-30 16:39:31 +02:00
Laurent Destailleur
d3c95e030b
Fix delete file not possible for external user even with permissions
2017-08-30 14:34:36 +02:00
Alexandre SPANGARO
4998eb3061
Fix: Accountancy journal, fetch on rowid, not code
2017-08-29 21:21:59 +02:00
Laurent Destailleur
945fb61e59
Update facture.class.php
2017-08-29 18:22:01 +02:00
atm-quentin
07f7db1b6d
FIX createFromCurrent lastvalue
2017-08-29 11:22:50 +02:00
Laurent Destailleur
7aa09d8b71
NEW Can create thirdparty from card proposal, order or invoice
2017-08-28 18:37:16 +02:00
Laurent Destailleur
e04dd3c807
Fix php unit
2017-08-27 15:05:35 +02:00
Laurent Destailleur
6c93c6f6cc
Fix PHPunit
2017-08-27 13:38:42 +02:00
Laurent Destailleur
502ac19a0a
Fix regression on categories
2017-08-27 12:28:59 +02:00
Laurent Destailleur
3f7eea2e0a
NEW Can set language on extrafields
2017-08-27 12:12:02 +02:00
Laurent Destailleur
f10e89aa9f
Fix utf8 bom forbidden
2017-08-27 00:33:50 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
782b85ba13
Merge pull request #7285 from hregis/6.0_bug
...
Fix: avoid error "A non-numeric value encountered"
2017-08-26 19:31:16 +02:00
Laurent Destailleur
b3f77ed9f7
Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec
...
NEW extrafield on facture_rec
2017-08-26 19:26:09 +02:00
Laurent Destailleur
55c4ef7ffc
Merge pull request #7227 from Darkjeff/dev-report
...
Dev report from bookkeeping
2017-08-26 19:20:57 +02:00
John
040071b07b
Change copyright comment
2017-08-25 16:25:40 +02:00
John
c9643109df
Fix comment doc
2017-08-25 16:21:34 +02:00
Laurent Destailleur
7d9a18a63d
Fix sql error
2017-08-24 15:39:23 +02:00
John
0653a5d177
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec
2017-08-24 14:35:01 +02:00
Regis Houssin
ad39c30c21
Fix: change old email
2017-08-23 21:23:18 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Regis Houssin
7da1b215f3
Fix: avoid error "A non-numeric value encountered"
2017-08-23 21:01:14 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
aae24c26a3
Some fixes with smartphones
2017-08-22 20:20:34 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
97dbb40ad6
Fix syntax error
2017-08-22 18:42:35 +02:00
John
b18104788e
New extrafield on facture_rec
2017-08-22 15:22:41 +02:00
Laurent Destailleur
b3d1cdf84c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-08-22 10:11:32 +02:00
Laurent Destailleur
9be342bd25
Fix missing $form
2017-08-22 10:02:45 +02:00
Laurent Destailleur
398733ff9a
Fix syntax error
2017-08-17 23:44:16 +02:00
Laurent Destailleur
22a7c9bd6b
Merge pull request #7220 from guerrierk/develop
...
NEW|Add possibility to propose last num releve in conciliation
2017-08-17 23:42:07 +02:00
delcroix Patrick
593d06e91e
Reconcile take pqge number into account
2017-08-09 22:24:06 +02:00
Laurent Destailleur
402e6bf650
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
2017-08-04 15:39:00 +02:00
Laurent Destailleur
06e35149f7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-08-04 15:32:40 +02:00
Laurent Destailleur
7c840b8348
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-08-04 15:32:30 +02:00
Laurent Destailleur
a7dda865c9
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-08-04 15:29:54 +02:00
Laurent Destailleur
a3beceade2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-08-04 15:28:55 +02:00
Laurent Destailleur
d345b9503a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-08-04 15:28:03 +02:00
Laurent Destailleur
f8d6eb0d40
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-08-04 15:25:41 +02:00
Laurent Destailleur
86e4207145
Merge branch '6.0' into 6.0-p3
2017-08-04 15:21:41 +02:00
Laurent Destailleur
56426ad3d9
Merge pull request #7228 from aspangaro/6.0-d2
...
Fix v6: SQL error in payment list and remove function length_accountg in bank index
2017-08-04 15:18:43 +02:00
Laurent Destailleur
4cb2a0bce2
Update list.php
2017-08-04 15:17:30 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Marc de Lima Lucio
adbb41799c
FIX: calculate correct remain to pay for planned bank transactions
2017-08-01 11:08:58 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Alexandre SPANGARO
e41543c22e
Fix v6: Debug various_payment
2017-08-01 06:44:37 +02:00
Alexandre SPANGARO
3c34add0d6
remove condition
2017-08-01 06:26:35 +02:00
Alexandre SPANGARO
9629a50853
Fix: SQL error in payment list
2017-08-01 06:21:19 +02:00
Alexandre SPANGARO
efd24cc1a2
Fix: function length_accountg has been moved in getNomUrl
2017-08-01 06:16:23 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
8c287174b0
Merge pull request #7215 from aspangaro/6.0-d1
...
Debug various_payment
2017-07-31 02:32:46 +02:00
Laurent Destailleur
b0adc9cca4
Merge pull request #7207 from atm-quentin/FIX_next_situation_load_extrafields
...
FIX next situation keep extrafields
2017-07-31 02:24:46 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
GUERRIER Kevin
b6b3ab3f1b
NEW Add Next/Previous button on operation date of bank line
...
Operation date has to be frequently updated because some bank change them in many case. With this feature, this value can be updated simply like the value date.
2017-07-29 15:07:27 +02:00
GUERRIER Kevin
ded6b40489
Add possibility to propose last num releve in conciliation
2017-07-29 14:21:58 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
Alexandre SPANGARO
d8c6bc4a67
Fix: informations (Add account & correct tooltip)
2017-07-28 07:42:02 +02:00
Alexandre SPANGARO
5a932f993d
Fix: function length_accountg has been moved in getNomUrl
2017-07-28 07:27:04 +02:00
Alexandre SPANGARO
0e23873945
Fix: SQL error in payment list
2017-07-28 07:18:41 +02:00
Alexandre SPANGARO
66067f980b
Fix: cancel in create mode
2017-07-28 07:00:52 +02:00
Alexandre SPANGARO
95672e3bf0
Merge remote-tracking branch 'uptream/6.0' into 6.0-d1
2017-07-28 06:40:47 +02:00
Alexandre SPANGARO
0e86bfb6d4
Fix : delete function
2017-07-28 06:40:15 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
2017-07-26 21:22:53 +02:00
atm-quentin
09a1118036
FIX extrafields for invoice too
2017-07-26 15:55:50 +02:00
Regis Houssin
89a9049ccb
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-26 15:25:17 +02:00
atm-quentin
29a4900d0b
FIX_next_situation_keep_extrafields
2017-07-26 15:20:31 +02:00
Laurent Destailleur
d0682c76d6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-26 10:12:54 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
abb346651e
Close #6807
2017-07-25 21:27:07 +02:00
Laurent Destailleur
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
b7c4f1f086
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 21:05:15 +02:00
Laurent Destailleur
764b47cf47
Merge pull request #7202 from atm-florian/dev_depositinvoicemoreexplicit
...
NEW : Deposit invoice more explicit in invoice line description
2017-07-25 19:22:42 +02:00
Laurent Destailleur
7838ec6ed8
Merge pull request #7203 from atm-florian/dev_regen_invoice
...
NEW : generate invoice PDF on disount application or payment
2017-07-25 19:12:53 +02:00
florian HENRY
d6d454edc8
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:32:27 +02:00
Laurent Destailleur
149e1f9c67
Merge pull request #7195 from atm-florian/6.0
...
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:31:40 +02:00
florian HENRY
cdcbff2a85
NEW : generate invoice PDF on disount application or payment
2017-07-25 12:20:51 +02:00
florian HENRY
0dba6f3383
NEW : Deposit invoice more explicit in invocie line description
2017-07-25 11:32:41 +02:00
Laurent Destailleur
cba898e2b9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 10:12:28 +02:00
Laurent Destailleur
fdcc067c23
Fix regression. Restore lost link "Other invoices".
2017-07-25 10:02:56 +02:00
Laurent Destailleur
aa9b4ce1f3
Fix too long combo for tags
2017-07-25 09:49:08 +02:00
florian HENRY
b9d5f4ba10
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-24 09:02:32 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
2efb86b5d8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
764c7ac792
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/websites/index.php
2017-07-22 20:46:02 +02:00
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
9e6666e511
Fix translation keys for taxes
2017-07-22 16:40:19 +02:00
Laurent Destailleur
6470b62f56
Fix bad rounding
2017-07-22 16:13:21 +02:00
Laurent Destailleur
5207b84e8b
Fix compatibility with indian IGST/CSGST/SGST
2017-07-22 01:56:38 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Darkjeff
dcc3febf6f
add bookkkeeping in report turnover
2017-07-20 18:22:53 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
5e1dbdc608
Update index.php
2017-07-18 14:35:11 +02:00
Articoder InfoSec Team
0179160f6c
Reason: similar change is present elsewhere in the code
...
Notes: please review carefully before accepting. patch propagation. manual test run.
Reviewed By: https://github.com/dchichkov
Cherry picked from:
===
From 0d62bd704e
2017-07-18 14:34:57 +02:00
Laurent Destailleur
c10852bea3
Merge pull request #7158 from articoder-infosec/patch-1
...
Reason: similar change is present elsewhere in the code.
2017-07-18 14:33:41 +02:00
Laurent Destailleur
ba660a041c
Update index.php
2017-07-18 14:33:32 +02:00
Laurent Destailleur
a416ec4258
Try to fix travis
2017-07-18 14:25:07 +02:00
gauthier
ccbeb162cf
FIX : Buying prices must always be in positive valueo
2017-07-17 11:27:57 +02:00
phf
885fc3c5b7
Fix lost search value in list if come from thirdparty card
2017-07-17 11:04:48 +02:00
Laurent Destailleur
5c0e581d5a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-16 13:01:07 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
84d76f26f2
Fix missing picto
2017-07-15 21:55:05 +02:00
Laurent Destailleur
75ec7a309c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-15 21:25:14 +02:00
Laurent Destailleur
3cd21ee659
Fix sort order
2017-07-15 21:19:39 +02:00
Laurent Destailleur
bab963ec07
FIX Pagination on the ledger page.
2017-07-15 19:19:12 +02:00
Laurent Destailleur
1735a649e9
Fix permission on salary module
2017-07-15 13:02:41 +02:00
Laurent Destailleur
ab6646d16b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/bank/bankentries.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-07-15 03:54:50 +02:00
Laurent Destailleur
cb87b314be
FIX Maxi debug of journalization of bank journal.
2017-07-15 03:41:07 +02:00
Laurent Destailleur
24ecd48b22
Minor fix
2017-07-15 03:40:37 +02:00
Articoder InfoSec Team
8ef5fcd90a
Reason: similar change is present elsewhere in the code
...
Notes: please review carefully before accepting. patch propagation. manual test run.
Reviewed By: https://github.com/dchichkov
Cherry picked from:
===
From 0d62bd704e
2017-07-14 15:57:22 -07:00
Laurent Destailleur
0fc56d2bcd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-14 15:26:03 +02:00
Laurent Destailleur
e551c0a665
Fix autofill of amount on supplier payment page
2017-07-14 15:22:30 +02:00
Laurent Destailleur
3ac85e10c5
NEW Add mass action "validate" on supplier invoices.
...
NEW Add date_valid and date_pointoftax on supplier invoices.
2017-07-14 14:40:09 +02:00
Laurent Destailleur
3db7bd7624
Fix look and feel v6
2017-07-13 17:44:12 +02:00
Laurent Destailleur
2b77c9b5c7
FIX #7050
2017-07-13 16:56:36 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
florian HENRY
262e23bc41
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_fixtransfert
Conflicts:
htdocs/compta/bank/transfer.php
2017-07-10 13:48:22 +02:00
Laurent Dinclaux
253f7e252d
Fixes local taxes repports by rate
2017-07-10 13:15:14 +11:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
1d35c87c18
Merge pull request #7125 from aspangaro/6.0-fec3
...
Fix some problems
2017-07-07 20:32:27 +02:00
Laurent Destailleur
34d0c79e32
Merge pull request #7124 from fappels/develop_updateline_notriggerflag
...
New add trigger disable to updateline functions
2017-07-07 20:30:04 +02:00
Laurent Destailleur
749e5eb7f4
Fix link
2017-07-07 20:24:39 +02:00
Laurent Destailleur
552031799d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-07 19:42:37 +02:00
Laurent Destailleur
b7af0cca63
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/holiday/card.php
2017-07-07 19:39:57 +02:00
Laurent Destailleur
a026e1d701
Close #7095
2017-07-07 19:32:03 +02:00
Laurent Destailleur
c459d3aa7a
FIX user that modify not set
2017-07-07 19:23:19 +02:00
Laurent Destailleur
fd5f992be4
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-07-07 19:15:18 +02:00
Laurent Destailleur
4c1b485d47
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2017-07-07 19:06:25 +02:00
Laurent Destailleur
d58682c574
Merge pull request #7088 from atm-arnaud/FIX_edit_social_emptying_label
...
FIX edit sociale was emptying label
2017-07-07 18:59:10 +02:00
florian HENRY
1c647e2898
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2017-07-07 15:59:41 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
Alexandre SPANGARO
0c5febfb4d
Fix: Accountancy
2017-07-07 06:09:49 +02:00
fappels
6effcb0829
New add trigger disable to updateline functions
2017-07-06 16:26:15 +02:00
florian HENRY
ffb8c684d0
NEW : Can transmer from bank account to bank account with different
...
currency
2017-07-06 13:40:26 +02:00
florian HENRY
7f869b4840
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
2017-07-03 14:36:50 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Laurent Destailleur
7ae52d843c
Look and feel v6
2017-07-01 14:23:24 +02:00
Laurent Destailleur
31fe8ebcee
Debug v6
2017-07-01 02:22:08 +02:00
arnaud
ca6ce2ba8b
FIX status were wrong on product referent list
2017-06-30 10:38:54 +02:00
arnaud
f79b72f724
FIX edit sociale was emptying label
2017-06-29 16:57:30 +02:00
florian HENRY
6e8c83b2a9
fix class error (given by eclipse Oxygen version)
2017-06-29 15:47:33 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
arnaud
65b9b70ff8
FIX invoice page list
2017-06-27 15:23:51 +02:00
John
93477c102f
FIX delete linked element on facture rec
2017-06-26 15:44:04 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae
Fixing pages warning when value is null
2017-06-24 16:45:45 +02:00
Laurent Destailleur
534ec0d44a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries.php
2017-06-24 16:26:29 +02:00
Laurent Destailleur
e79f3715b4
FIX #7048 #6075
2017-06-24 16:21:25 +02:00
Laurent Destailleur
a05bbd651c
Fix translation
2017-06-23 11:09:29 +02:00
Laurent Destailleur
ecae2fc6b6
Fix translation
2017-06-23 11:08:49 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
d78d5d60c4
Fix pgsql
...
Fix missing vat rate info.
2017-06-20 01:45:44 +02:00
Laurent Destailleur
cffb368bbd
Merge pull request #7030 from aspangaro/6.0-fec3
...
Fix : Accountancy - Debug and add information in database
2017-06-19 15:02:30 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Alexandre SPANGARO
a4de12dd8d
Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
2017-06-18 22:15:36 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Alexandre SPANGARO
b240f536b5
Fix : Accountancy - Debug and add information in database
2017-06-17 07:54:35 +02:00
Laurent Destailleur
1c8daf9700
Standardize and debug code of module BlockedLog
2017-06-16 12:46:15 +02:00
Laurent Destailleur
26e80045a6
Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW log download or preview event on a validate bill
2017-06-16 11:06:27 +02:00
Laurent Destailleur
f39fb5187a
Fix component to select journal
2017-06-15 20:27:40 +02:00
phf
3333049341
Fix total aren't aligned
2017-06-15 11:11:49 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
phf
d2db5f60a8
Fix css to apply "pair" and "impair" style
2017-06-14 09:42:05 +02:00
Laurent Destailleur
c088ccea32
Fix better management of export of extrafield computed.
2017-06-13 18:50:31 +02:00
alexis Algoud
ef0907d89e
NEW log download or preview event on a validate bill
2017-06-13 15:55:22 +02:00
phf
4c0b0ef4c2
Fix display on situation invoice
2017-06-13 11:29:12 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Regis Houssin
8b0354cfdf
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-06-11 16:43:31 +02:00
Laurent Destailleur
248c5acff2
Fix remove a FIXME tag.
2017-06-11 16:18:21 +02:00
Laurent Destailleur
5471170a97
Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW blockedlog hash and authority
2017-06-11 15:54:47 +02:00
Regis Houssin
d1233755f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:41:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Alexis Algoud
3d5899edf3
final blockedlog init
2017-06-10 09:25:32 +02:00
Laurent Destailleur
4b4b2ad1b7
Merge pull request #6965 from atm-maxime/fix_converttoreduc
...
Fix : button convert was still available even if deposit was already …
2017-06-10 00:10:45 +02:00
Laurent Destailleur
9341d5f448
FIX Line of invoices not inserted when using POS module and VAT NPR.
2017-06-09 15:35:27 +02:00
Laurent Destailleur
cc37a7d848
Fix parenthesis
2017-06-09 13:11:34 +02:00
Laurent Destailleur
24eebfeb61
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-06-09 12:57:14 +02:00
Maxime Kohlhaas
92b7914ef3
Fix : button convert was still available even if deposit was already converted
2017-06-09 11:09:06 +02:00
Regis Houssin
58b3d86b49
Fix: errors
2017-06-09 09:40:43 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Laurent Destailleur
97f9d8a87e
Merge pull request #6957 from aspangaro/6.0-vat2
...
Fix : Missing ref of getNomUrl in AccountLine (Bank)
2017-06-08 10:16:32 +02:00
Alexandre SPANGARO
3827903afb
Merge remote-tracking branch 'uptream/develop' into 6.0-vat2
...
# Conflicts:
# htdocs/compta/salaries/card.php
2017-06-08 06:44:48 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Alexandre SPANGARO
a96049d0e6
Spaces!!!
2017-06-07 06:06:53 +02:00
Alexandre SPANGARO
c041fe2165
Fix : Missing ref of getNomUrl in AccountLine (Bank)
2017-06-07 06:03:52 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
4bda7fcafc
Merge pull request #6949 from aspangaro/6.0-vat2
...
NEW : VAT payment v6 look and feel
2017-06-06 11:08:50 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Alexandre SPANGARO
e547aa8aee
NEW : VAT payment v6 look and feel
2017-06-05 15:41:33 +02:00
Maxime Kohlhaas
6787d717f9
Update bonprelevement.class.php
2017-06-03 18:23:19 +02:00
Regis Houssin
a25facef7c
Fix: use 0 instead false
2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
3555bd2bd7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
2017-06-03 01:29:59 +02:00
Laurent Destailleur
37a261587e
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-06-03 01:17:03 +02:00
gauthier
fb252706f9
FIX : situation_progress param default value must be 100 and not 0
2017-06-01 15:42:19 +02:00
Maxime Kohlhaas
0e175ba373
Fix : SEPA XML address should also have dolEscapeXML
2017-06-01 11:48:14 +02:00
Laurent Destailleur
d70c14a411
Update bonprelevement.class.php
2017-05-31 19:07:39 +02:00
Alexandre SPANGARO
21183f91a3
FIX : Vat payment - Sql error / Add information in tooltip / Correct writting in general ledger
2017-05-31 05:27:39 +02:00
Regis Houssin
aa780ea33b
Fix: missing dot
2017-05-30 19:15:37 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Maxime Kohlhaas
510b1aedcf
Fix xml SEPA $ListOfFactures not used and was listing all invoices in each XML line
2017-05-30 16:13:49 +02:00
Maxime Kohlhaas
200f4010d8
Fix special char and size limit in SEPA XML
2017-05-30 16:00:39 +02:00
Laurent Destailleur
ae6c58fb57
FIX #6808
2017-05-29 14:16:09 +02:00
Laurent Destailleur
478349174c
Merge pull request #6902 from aspangaro/6.0-salary
...
NEW : Move employee in dol_banner in salaries
2017-05-29 11:47:10 +02:00
Laurent Destailleur
395d361d66
Look and feel v6
2017-05-29 11:38:23 +02:00
Laurent Destailleur
85c3880479
Look and feel v6
2017-05-29 10:58:41 +02:00
Laurent Destailleur
0c5bf21f3a
Merge pull request #6900 from aspangaro/6.0-d1
...
Review expense report - Look and feel v6
2017-05-29 10:56:57 +02:00
Laurent Destailleur
452579150d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
b22817c237
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2017-05-29 10:25:07 +02:00
Alexandre SPANGARO
0d3c5bcfa8
Update documents & info page - better look & feel v6
2017-05-29 06:35:53 +02:00
Alexandre SPANGARO
dad1abd55b
NEW : Move employee in dol_banner in salaries
2017-05-29 06:22:21 +02:00
Alexandre SPANGARO
783cec0d6d
Move to getNomUrl for expense report in bank entries
2017-05-27 07:21:59 +02:00
Alexandre SPANGARO
1711107420
FIX : colspan in bank entries
2017-05-27 07:11:17 +02:00
Alexandre SPANGARO
1f079fac9d
Move html.formventilation.class.php to html.formaccounting.class.php
2017-05-25 06:57:28 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
8301e24261
PHP7 compatibility
2017-05-22 10:40:24 +02:00
Laurent Destailleur
4a085a8cc0
Fix phpunit
2017-05-21 21:21:44 +02:00
Laurent Destailleur
5992175b68
Standardize code between customer and supplier invoice list.
2017-05-21 03:23:44 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
54f9990467
Merge pull request #6836 from atm-ph/fix_deposit_calculation
...
Fix wrong calculation
2017-05-20 11:57:05 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
2f72edca6c
Merge pull request #6853 from grandoc/new_branch_16_05
...
Update code using new css class
2017-05-18 17:51:58 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
a8afa547f0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
2017-05-17 15:20:17 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
philippe grand
99cc67d123
Update code using new css class
2017-05-16 12:43:16 +02:00
arnaud
c9738aa7ea
FIX doactions hook missing in invoice model page
2017-05-16 11:34:00 +02:00
Laurent Destailleur
cc95e046e5
NEW Can sort customer balance summary on date
2017-05-16 03:34:49 +02:00
Laurent Destailleur
ce84990414
NEW On invoices generated by template, we save if of source template.
2017-05-16 02:46:19 +02:00
phf
3da7b9543d
Fix double quote
2017-05-15 15:10:15 +02:00
phf
f10b77f190
Fix html id 'tablelines' exist twice
2017-05-15 15:05:42 +02:00
phf
d120a391f9
Fix use $numlines instead $i
2017-05-15 10:26:40 +02:00
Alexandre SPANGARO
becd023032
Fix : tooltip on supplier invoice payment
2017-05-15 05:11:00 +02:00
Alexandre SPANGARO
4dc7d5cd8d
Fix : tooltip on bank in customer invoice card
2017-05-14 21:20:35 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Alexandre SPANGARO
143c019905
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-14 08:07:34 +02:00
Laurent Destailleur
1d0e9b0a59
Merge pull request #6828 from atm-alexis/FIX_situation_invoice_allpercent
...
FIX situation invoice broken
2017-05-13 20:14:48 +02:00
Laurent Destailleur
57ba598b15
Merge pull request #6771 from aspangaro/6.0-stripe
...
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
b568877f22
Merge pull request #6829 from grandoc/new_branch_10_05
...
Update code using new css class
2017-05-13 19:47:27 +02:00
Laurent Destailleur
dec602a27b
Merge pull request #6838 from atm-ph/fix_invoice_credit_note_standalone
...
Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work
2017-05-13 19:45:42 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
b81de35703
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e
Fix escaping class
2017-05-12 15:28:10 +02:00
phf
b092b6861a
Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work
2017-05-11 12:48:47 +02:00
Laurent Destailleur
eb4cfc11cb
Fix syntax error
2017-05-11 11:58:16 +02:00
phf
17f37cc9e1
Fix wrong calculation
2017-05-11 11:41:00 +02:00
Philippe Grand
26df028efe
Update bilan.php
2017-05-11 09:17:43 +02:00
Philippe Grand
be6be3e533
Update bilan.php
2017-05-11 09:16:44 +02:00
Philippe Grand
449869c37b
Update bilan.php
2017-05-11 09:15:35 +02:00
Philippe Grand
f231864b3f
Update bilan.php
2017-05-11 09:13:51 +02:00
alexis Algoud
c2f76522eb
fix form inside table
2017-05-11 09:04:14 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
d19d733f95
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-10 23:28:24 +02:00
Laurent Destailleur
0734b99d3a
Fix sql syntax
2017-05-10 23:27:48 +02:00
Laurent Destailleur
7ab151dc0d
Merge pull request #6809 from Gecka-Apps/5.0
...
New-Caledonia uses the same bank accounts patterns than France
2017-05-10 23:02:29 +02:00
Laurent Destailleur
1c7d9b9d9a
Merge pull request #6804 from aspangaro/6.0-multijournal
...
New : Accountancy - Add a list to select the bank journal in bank card
2017-05-10 22:46:30 +02:00
Benoit
ec4e416a6c
Fix bug xhen insert new bankline
2017-05-10 22:44:08 +02:00
Laurent Destailleur
33e93e9294
Merge pull request #6801 from benlo06/BUG_ACCOUT_CATEGORIES
...
Fix add new line for bank records
2017-05-10 22:43:18 +02:00
philippe grand
b7b16dc632
Update code using new css class
2017-05-10 16:41:19 +02:00
alexis Algoud
bba8f972a1
FIX situation invoice broken
...
due to the all percent application form inside addline form
2017-05-10 16:10:14 +02:00
Laurent Destailleur
199b4dfeb5
Merge pull request #6816 from Gecka-Apps/5.0-fixes
...
Add local taxes support to predefined invoices
2017-05-10 14:52:23 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
383dfc0c96
FIX Pagination of invoices
2017-05-10 11:51:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
0b97ee42cf
NEW Can use a credit note into a "down payment/deposit".
2017-05-09 18:15:50 +02:00
Laurent Dinclaux
c88656edb4
Fix PHPDOC comments
2017-05-09 23:59:37 +11:00
Laurent Dinclaux
6cac627117
Add support for localtaxes to predefined invoices
2017-05-09 23:19:16 +11:00
Alexandre SPANGARO
16a41242d3
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-05-08 06:39:14 +02:00
Laurent Dinclaux
8c75fc0e52
New-Caledonia uses the same bank accounts patterns than France
2017-05-07 14:11:47 +11:00
Alexandre SPANGARO
7c4b47f20d
Update works
2017-05-06 08:33:12 +02:00
Alexandre SPANGARO
68aaef2f66
Add list to select journal in bank
2017-05-06 08:06:01 +02:00
Benoit
e28dff19ee
Fix bug xhen insert new bankline
2017-05-05 22:21:46 +02:00
Laurent Destailleur
806157ae40
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 17:52:22 +02:00
Laurent Destailleur
15d20497c8
FIX #6795 #6796
2017-05-05 17:46:22 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
65e03ca3ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 12:34:22 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
5f507dd6ed
Merge pull request #6777 from aspangaro/6.0-accountancy_bank
...
Use getnomUrl on bank accountancy number
2017-05-05 10:00:32 +02:00
Laurent Destailleur
82c8cee1ff
Merge pull request #6751 from AlainRnet/patch-5
...
FIX #6614 without html.formprojet.class.php called, not possible create invoice…
2017-05-04 20:58:50 +02:00
Laurent Destailleur
944cd40ef4
Merge pull request #6749 from atm-florian/5.0_fix6614
...
FIX #6614
2017-05-04 13:59:24 +02:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Alexandre SPANGARO
fa4bb4e80a
Remove accounting.lib.php
2017-05-01 21:12:52 +02:00
Alexandre SPANGARO
e1e2481e37
Remove picto
2017-05-01 21:09:09 +02:00
Alexandre SPANGARO
102deccba7
Use getnomUrl on bank accountancy number
2017-05-01 21:06:31 +02:00
Laurent Destailleur
58e2b49b1c
Clean code
2017-04-30 13:49:06 +02:00
Laurent Destailleur
7c2b3b8df0
NEW When down payment is entered, discount to reuse into final invoice
...
is automatically created. This save one click into invoice workflow.
2017-04-30 12:55:11 +02:00
Laurent Destailleur
cc8e66d079
FIX Journal code of bank must be visible of accountaing module on.
2017-04-29 15:30:40 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +02:00
Laurent Destailleur
c722286bcb
Fix regressions
2017-04-28 13:37:36 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
AlainRnet
d9cdaeb851
without html.formprojet.class.php called, not possible create invoice template
...
cf. https://github.com/Dolibarr/dolibarr/issues/6614
without this class AND module Projects disabled, it's not possible to create an invoice template. So I pulled out the call of the class from the condition.
2017-04-24 15:43:36 +02:00
florian HENRY
8f97177dae
FIX 6614
2017-04-24 14:44:44 +02:00
Alexandre SPANGARO
c3fe1c963a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-22 06:33:31 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-17 06:51:02 +02:00
Juanjo Menent
3308775c06
Merge pull request #6701 from joseplluis/patch-6
...
NEW Show local taxes in facture list
2017-04-16 11:03:59 +02:00
Juanjo Menent
00390bc8e4
Merge pull request #6705 from atm-florian/5.0
...
fix setEventMessages error insteads of errors
2017-04-16 10:19:19 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
ac884ec463
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/install/repair.php
2017-04-15 16:28:08 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
florian HENRY
196156a21e
fix setEventMessages error insteads of errors
2017-04-13 16:35:29 +02:00
Josep Lluís
deb309ab7e
NEW Show local taxes in facture list
...
Show localtax1 and localtax2 in facture list, only if they are enabled in company config
2017-04-13 08:30:48 +02:00
Laurent Destailleur
6f4ce8dc2f
Merge remote-tracking branch 'origin/3.9' into 4.0
2017-04-12 14:22:47 +02:00
Laurent Destailleur
d78f3923ee
Support of preview for pdf with several pages
2017-04-12 12:13:38 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
4eaa1d4f46
Add nb of generation into list of template invoices
2017-04-11 20:07:35 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Laurent Destailleur
eb4236011b
Merge pull request #6670 from marcosgdf/bug-6669
...
FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry
2017-04-11 11:15:16 +02:00
Laurent Destailleur
e08b92d913
Merge pull request #6665 from defrance/patch-4
...
Add invoice_rec_prepare_head for reccuring invoice
2017-04-11 11:13:12 +02:00
Marcos García de La Fuente
996b5e9f87
Corrected translation errors and little bug showing a non-available button to a restricted user
2017-04-09 18:17:46 +02:00
Marcos García de La Fuente
411d276ed2
FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry
...
Close #6669
2017-04-09 14:29:40 +02:00
BENKE Charlie
54780ff205
Update fiche-rec.php
2017-04-09 11:33:09 +02:00
vvnt
ff75077b34
Fix: bug #6653 situation invoice miscalculation
...
Bug (#6653 )
In price.lib.php (htdocs\core\lib\price.lib.php), the function calcul_price_total() is defined (line 76). The 7th parameter is **$remise_percent_global**.
However, this function is called on facture.class.php (htdocs\compta\facture\class\facture.class.php) and the 7th parameter used is **$line->product_type**. Consequently, invoice situation is correct when user sells a product (product_type = 0) and is wrong when user sells a service (product_type = 1).
Effectively, in the latter case, the total situation invoice will be wrong by 1%.
In order to correct this, we can add 0 as the 7th parameter and move **$line->product_type** to the 10th parameter.
2017-04-08 20:15:14 +02:00
Laurent Destailleur
76af83ce06
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-08 14:06:25 +02:00
Laurent Destailleur
56a4b7a1fd
Work on v6 look and feel
2017-04-08 14:03:38 +02:00
Laurent Destailleur
31f580ad93
FIX Enter a direct bank transaction
2017-04-08 01:25:52 +02:00
Laurent Destailleur
a0e75d0af0
Work on look and feel v6
2017-04-07 18:38:55 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
ea44e14b60
Start debug the variant module
2017-04-07 11:01:12 +02:00
Laurent Destailleur
216bce608d
Work on v6 look and feel
2017-04-06 23:28:06 +02:00
Laurent Destailleur
915a74a85f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-06 22:32:05 +02:00
Laurent Destailleur
a99a4be9e0
Work on 6.0 look and feel
2017-04-06 22:31:45 +02:00
Laurent Destailleur
07bbf1a32b
Merge pull request #6648 from delcroip/patch-9
...
NEW : show files in the bank statement + download
2017-04-06 22:31:19 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f
FIX #6636 Complete fix
2017-04-06 21:55:23 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
arnaud
6b2d8a3c34
FIX limit+1 dosn't show Total line
2017-04-06 11:14:15 +02:00
delcroix Patrick
337eac30c1
Update releve.php
2017-04-05 21:14:41 +02:00
delcroix Patrick
ca72e5e19f
NEW : download button
2017-04-05 20:53:41 +02:00
delcroix Patrick
dae0828543
NEW : show files in the bank statement + download
2017-04-05 20:50:18 +02:00
Laurent Destailleur
e8767122b0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/societe/list.php
2017-04-03 11:05:19 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
a2da0dab7d
FIX bank account not visible on payment card
2017-04-02 21:42:16 +02:00
Laurent Destailleur
d975e7f442
Work on 6.0 look and feel
2017-04-01 12:46:47 +02:00
Laurent Destailleur
93687997c9
Work on 6.0 look and feel
2017-03-31 18:40:53 +02:00
Marcos García de La Fuente
2448b9ee55
FIX #6619 Template invoices list do not respect restricted thirdparty user rights
2017-03-30 14:52:26 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
2f439fed85
Code for 6
2017-03-28 13:31:28 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
Laurent Destailleur
0838953ef7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-27 00:49:24 +02:00
Laurent Destailleur
278bbf184c
Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
...
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
Laurent Destailleur
b420b288ca
Merge pull request #6559 from aspangaro/5.0-p2
...
Fix : missing language file in salaries index
2017-03-24 22:44:46 +01:00
BENKE Charlie
2b1c29316f
Display totalLine if one of total field are present
2017-03-24 22:13:58 +01:00
Alexandre SPANGARO
35da94bbc2
Fix : missing language file in salaries index
2017-03-24 06:38:26 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
53a04703d6
Uniformize code
2017-03-23 16:10:38 +01:00
Laurent Destailleur
22247271f6
CSS enhancement
2017-03-23 13:19:00 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01:00
Alexandre SPANGARO
2bc7f10cd6
Fix
2017-03-21 06:45:13 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
80f7bce8d8
Fix duplicate <a>
2017-03-20 20:41:43 +01:00
