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
Alexandre SPANGARO
6d5578a876
Reactivated constant BANK_DISABLE_DIRECT_INPUT
2017-03-19 20:47:30 +01:00
Alexandre SPANGARO
b09398a68e
Update works
2017-03-19 15:23:35 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
36f279837f
Update work
2017-03-19 08:17:32 +01:00
Alexandre SPANGARO
e07f934185
Class is missing
2017-03-19 07:26:37 +01:00
Alexandre SPANGARO
504e1e1ec8
Step 3: Work on card
2017-03-19 07:26:15 +01:00
Alexandre SPANGARO
16b12b33fc
First step : remove BANK_DISABLE_DIRECT_INPUT
2017-03-18 07:24:55 +01:00
Laurent Destailleur
7dd0f14563
Fix link to reconciliated function
2017-03-16 21:03:35 +01:00
Alexandre SPANGARO
c6c07bf9f4
New : Add project to social contributions
2017-03-12 14:32:49 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Alexandre SPANGARO
6ce8aa7d6f
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-03-07 22:08:23 +01:00
Laurent Destailleur
4e4045d18a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:12:08 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
2a1060c0fc
Merge pull request #6475 from defrance/patch-87
...
Situation total row left a col if bank enabled
2017-03-05 21:39:02 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
29953b46cd
Fix css
2017-03-03 15:32:34 +01:00
Laurent Destailleur
6ee286f5f7
FIX #6404
2017-03-03 15:11:41 +01:00
Laurent Destailleur
28ad50e059
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
2017-03-03 14:31:35 +01:00
Laurent Destailleur
be86664e43
FIX #6449
2017-03-03 14:27:01 +01:00
Laurent Destailleur
ea08c929c0
FIX #6476
2017-03-03 14:08:19 +01:00
Laurent Destailleur
0dd8db9073
Fix bank account label missing
2017-03-02 01:46:51 +01:00
Laurent Destailleur
d67d83515a
Fix dol_banner usage
2017-03-02 01:40:53 +01:00
Laurent Destailleur
1562df8f93
Fix responsive design
2017-03-02 01:26:15 +01:00
BENKE Charlie
706dd838c9
Situation total row left a col if bank enabled
2017-03-01 11:21:49 +01:00
Alexandre SPANGARO
05e50e1027
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-02-28 05:52:43 +01:00
Laurent Destailleur
821324868a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-27 12:15:31 +01:00
Laurent Destailleur
d5dc88d66b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-27 12:08:18 +01:00
Laurent Destailleur
f579fc6b2d
Code comment
2017-02-27 12:07:38 +01:00
Laurent Destailleur
1be389fd3e
FIX deletion of bank tag
2017-02-27 12:06:45 +01:00
Laurent Destailleur
4572a78618
Fix bad table deleted
2017-02-27 12:03:20 +01:00
Laurent Destailleur
c210b2349d
Fix bad table
2017-02-27 11:59:18 +01:00
Laurent Destailleur
0d07ad8c69
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/compta/bank/class/account.class.php
2017-02-27 11:58:35 +01:00
Laurent Destailleur
d9ba06e224
Fix bad table
2017-02-27 11:42:11 +01:00
Laurent Destailleur
10838983b5
FIX error management in bank account deletion.
2017-02-27 11:38:19 +01:00
Laurent Destailleur
024cecec29
FIX Error management during bank account creation
2017-02-27 11:16:46 +01:00
Laurent Destailleur
0f8a8869cb
FIX Error management during bank account creation
2017-02-27 11:15:59 +01:00
Laurent Destailleur
cff284b2f3
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/bank/categ.php
2017-02-27 10:55:18 +01:00
Laurent Destailleur
9ecc56ad4d
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-02-27 10:48:36 +01:00
Laurent Destailleur
3aaf9dae11
Fix parameter to cal cron method
2017-02-27 00:12:48 +01:00
Laurent Destailleur
29578a38bd
Keep previous behaviour if new option not set
2017-02-24 16:19:00 +01:00
Laurent Destailleur
7ee6dc7fa6
Merge pull request #6388 from atm-ph/new_deposit_with_multi_tva_management
...
New deposit with multi tva management
2017-02-24 16:16:33 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Alexandre SPANGARO
942b58efaf
New : Integration of Stripe
2017-02-22 06:33:52 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
ebe625aa16
Fix debug direct debit module
2017-02-21 13:16:28 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
Raphaël Doursenaud
b697da7399
Fix: [Payments] Properly escape variable for JS
...
The company name may contain reserved characters such as a quote
which needs proper escaping to prevent upsetting the JavaScript
interpreter.
2017-02-17 16:16:41 +01:00
Laurent Destailleur
498473715e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 01:48:43 +01:00
Laurent Destailleur
4c310964a9
Fix list of supplier proposals
2017-02-17 01:41:33 +01:00
Laurent Destailleur
4a8006b330
Fix style
2017-02-16 23:15:47 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
ca67917e80
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
Laurent Destailleur
d461c0dfa4
Fix left align
2017-02-10 10:47:19 +01:00
Laurent Destailleur
66542b6367
Fix translation and link to direct debit payment
2017-02-10 10:43:54 +01:00
phf
579d350599
Fix keep the standard behaviour
2017-02-09 17:41:06 +01:00
gauthier
c01988ba43
FIX : delete bank class lines when we delete bank_categ
2017-02-09 17:28:37 +01:00
florian HENRY
ab0783edcc
FIX #6234
2017-02-08 17:18:06 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
phf
6b20bad847
add fixme
2017-02-07 11:14:27 +01:00
phf
0f421dc2b4
New global conf MAIN_DEPOSIT_MULTI_TVA to manage multi tva on deposit
2017-02-07 11:09:18 +01:00
Laurent Destailleur
8f52a34e71
Report of supplier payment is name "supplier_payments"
2017-02-06 20:37:42 +01:00
Laurent Destailleur
6cb3199824
Translation message
2017-02-06 12:03:20 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
f6144b9ecb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-02 02:24:57 +01:00
Laurent Destailleur
8f0ddf2b8c
Merge pull request #6342 from simnandez/5.0
...
Fix #6314 Sorting balance error
2017-02-02 01:03:21 +01:00
Laurent Destailleur
18f3e11c10
Merge pull request #6339 from atm-maxime/fix_numbering_display_error
...
Fix numbering was disaplying technical error instead of error message
2017-02-02 00:49:18 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
24c21cca27
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-28 15:56:27 +01:00
Laurent Destailleur
4f76626f51
FIX Creation of credit note on invoice with deposit stole the discount.
2017-01-28 15:55:44 +01:00
Laurent Destailleur
fd90bf466b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/societe/soc.php
2017-01-28 15:12:14 +01:00
Laurent Destailleur
c88e63ecc9
FIX #6259
2017-01-28 15:01:17 +01:00
Juanjo Menent
3e14a89eb0
Fix #6314
2017-01-27 23:05:29 +01:00
Maxime Kohlhaas
7b6488b1c7
Fix numbering was disaplying technical error instead of error message
2017-01-27 10:05:57 +01:00
Laurent Destailleur
70091eceed
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
f2f8d7b6a5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-27 01:21:34 +01:00
Laurent Destailleur
9f1959ffc8
Fix MVC Actions must be done before output
2017-01-27 01:21:20 +01:00
Laurent Destailleur
ade8fd1415
Fix table format
2017-01-27 01:20:56 +01:00
florian HENRY
28115689e8
fix : wrong $formproject->select_projects call on model invoice
2017-01-26 08:46:39 +01:00
Quentin Vial-Gouteyron
94b42021bd
fix payment method
2017-01-24 15:15:31 +01:00
Quentin Vial-Gouteyron
6011c98515
FIX payment method exception
2017-01-24 12:22:23 +01:00
Quentin Vial-Gouteyron
39a92df647
Massive withdrawal request
2017-01-24 11:50:07 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
5fd8b1efcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 21:23:35 +01:00
Laurent Destailleur
433ad9d59d
Fix responsive
2017-01-22 13:27:17 +01:00
Laurent Destailleur
66819a34fa
Fix several bugs
2017-01-22 13:19:07 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
ea97491a8f
Merge pull request #6288 from marcosgdf/fr-6280
...
NEW #6280 : Generate PDF after creating an invoice from a customer order
2017-01-20 18:11:47 +01:00
Laurent Destailleur
6780b20968
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43
Minor fixes
2017-01-20 14:10:57 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
3336943ff2
Fix responsive
2017-01-18 15:49:12 +01:00
Laurent Destailleur
d48f2507b5
Fix link attachment on bank document page
2017-01-18 15:37:45 +01:00
Laurent Destailleur
ddbb7ee1f4
Fix bad alignement
2017-01-18 15:26:50 +01:00
Laurent Destailleur
b6383399aa
Fix bad colspan
2017-01-18 15:23:37 +01:00
Laurent Destailleur
8f577b0754
Fix bad link
2017-01-18 15:19:17 +01:00
Laurent Destailleur
6f3677a322
FIX total payed wrong
2017-01-18 13:28:02 +01:00
Marcos García de La Fuente
e0cbcadd98
In case Model for document generation is not defined, the criteria to select the model is now:
...
1. Model for the object
2. Custom default module
3. Hardcoded default module
2017-01-16 21:16:05 +01:00
Marcos García de La Fuente
6dbb3efc89
NEW #6280 : Generate PDF after creating an invoice from a customer order
...
Close #6280
2017-01-16 20:24:26 +01:00
Laurent Destailleur
c1d6ad90b3
FIX #6255
2017-01-16 12:35:19 +01:00
Laurent Destailleur
43cb9c30b2
Fix var_dump
2017-01-16 12:21:37 +01:00
Laurent Destailleur
c01baf1223
FIX #6255
2017-01-16 12:16:49 +01:00
Laurent Destailleur
a05132d26e
Fix PHP 7.1 error
2017-01-16 09:05:09 +01:00
Laurent Destailleur
94a180a775
Fix POO best practice
2017-01-16 00:54:08 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Laurent Destailleur
edb79de54e
FIX javascript error
2017-01-12 18:07:19 +01:00
Laurent Destailleur
2c6672d17a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
Laurent Destailleur
46e330f749
Merge pull request #6256 from aspangaro/5.0-23
...
Fix : Bank - Presentation, no titlefield in a list
2017-01-12 10:09:38 +01:00
aspangaro
a583fd7a3b
Fix : Bank - Presentation, no titlefield in a list
2017-01-08 20:52:42 +01:00
aspangaro
dc605c915a
Fix : Bank - Missing language file
2017-01-08 07:46:30 +01:00
Laurent Destailleur
febd23fe41
Clean dead code
2017-01-03 11:22:03 +01:00
Laurent Destailleur
f07c741176
Fix missing error message on invoice creation
2017-01-02 11:31:21 +01:00
Laurent Destailleur
d986247e0f
Fix dol_banner
2017-01-01 19:53:05 +01:00
Laurent Destailleur
b642a3a602
Prepare release 5.0
2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
Laurent Destailleur
7dd06a1ae6
Fix margin pagination
2016-12-27 02:01:27 +01:00
Laurent Destailleur
6e00d7fee3
Fix date modification not visible
2016-12-27 01:41:04 +01:00
Laurent Destailleur
003045525f
Fix css
2016-12-27 01:32:29 +01:00
Laurent Destailleur
3e28f22bad
Fix style
2016-12-27 00:08:43 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Ferran Marcet
ae7f49b5d8
FIX: Deposits and credit notes weren't added in the received and pending columns
2016-12-21 18:40:05 +01:00
aspangaro
c187f95269
Social contribution : Complete work on dol_banner
2016-12-20 21:59:05 +01:00
Laurent Destailleur
fc401a9c68
Fix more security fixes
2016-12-18 17:27:06 +01:00
Laurent Destailleur
12e919b99d
Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin
...
Fix user right write margin
2016-12-18 10:53:34 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
phf
cca7967144
Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin
2016-12-15 16:19:54 +01:00
phf
21a648a052
Fix user right on margin module to write buyprice
2016-12-15 12:01:46 +01:00
Laurent Destailleur
ecab7cb70e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
2016-12-14 12:29:41 +01:00
Laurent Destailleur
6c4f15df63
Fix lot of fix in css look to match v5 rules.
2016-12-11 16:11:42 +01:00
Laurent Destailleur
2dcb97e61d
Continue work on dol_banner
2016-12-11 13:16:21 +01:00
Laurent Destailleur
372f50bbde
FIX Do not show total of balance if currencies differs
2016-12-11 11:51:21 +01:00
Laurent Destailleur
9b436ce871
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/product/class/product.class.php
2016-12-11 02:51:32 +01:00
Maxime Kohlhaas
177ec97689
Actualize currency on propal, order and invoice
2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
d426ab04f0
Multicurrency on proposal and order
2016-12-11 00:42:52 +01:00
Maxime Kohlhaas
466f89930e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
2016-12-10 22:42:17 +01:00
Juanjo Menent
5a2b8ff53c
FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1
2016-12-10 22:41:53 +01:00
Maxime Kohlhaas
7c82b18da0
New : allow to actualize currency rate
2016-12-10 22:07:25 +01:00
Laurent Destailleur
f21344eee0
Merge pull request #6120 from philippe-opendsi/develop
...
FIX : Display invalid message when save payment in invoice currency
2016-12-10 21:58:45 +01:00
Laurent Destailleur
0486815403
Merge pull request #6122 from aspangaro/5.0-b4
...
Bank : Detail of a banking writing more responsive (Remove rowspan)
2016-12-10 21:58:08 +01:00
aspangaro
14ce1bf3a6
Add information on bank payment tab
...
Need fk_user_modif and dater in 6.0
2016-12-10 21:52:33 +01:00
Maxime Kohlhaas
1f48e0486f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
2016-12-10 21:50:31 +01:00
aspangaro
896fbfe2ca
Bank : Detail of a banking writing more responsive (Remove rowspan)
2016-12-10 20:59:25 +01:00
philippe-opendsi
bc2c794484
FIX : Display invalid message when save payment in invoice currency
...
Display Payment higher than to pay
2016-12-10 19:57:11 +01:00
Maxime Kohlhaas
6474591e25
Allow to enter price in currency
2016-12-10 19:54:16 +01:00
aspangaro
542499d94e
Fix Social contribution - Missing information in tab information
2016-12-10 15:47:44 +01:00
aspangaro
bc189c0f6a
Responsive
2016-12-10 15:13:24 +01:00
florian HENRY
e61770671a
fix : create project from facture rec and back url wrong
2016-12-10 12:53:58 +01:00
Laurent Destailleur
bd1d076753
Merge pull request #6096 from aspangaro/5.0-b2
...
VAT payment card - Uniformize presentation
2016-12-10 11:44:38 +01:00
gauthier
ef721bebc6
FIX : break with no iteration
2016-12-09 17:48:03 +01:00
aspangaro
b1c007aa75
VAT payment card - Uniformize presentation
2016-12-09 06:59:24 +01:00
aspangaro
b31d5d7f75
VAT - Correct presentation on card
2016-12-08 22:50:03 +01:00
Laurent Destailleur
49f5ec6b52
Fix bugs reported by scrutinizer
2016-12-07 19:12:25 +01:00
Laurent Destailleur
1838670e31
Fix several security holes on api when used by external users
2016-12-07 19:02:39 +01:00
fappels
b918d7abc9
fix travis
2016-12-05 19:20:46 +01:00
fappels
7776ae6da4
Fix travis
2016-12-05 19:19:48 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
4b831537e5
Fix several problem in notes management of template invoices.
2016-12-04 21:27:08 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
7a3b309013
Fix width
2016-12-03 15:22:26 +01:00
Laurent Destailleur
e846d74654
Fix sort on invlice list
2016-11-30 15:19:16 +01:00
Laurent Destailleur
4bff869507
Merge pull request #6056 from aspangaro/5.0-p38
...
Presentation of social contribution
2016-11-29 23:22:58 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
aspangaro
953feefb6a
Social contribution in adaptive mode (Payment are under the information)
2016-11-29 06:43:16 +01:00
aspangaro
d73c24bb45
Social contribution in adaptive mode (Payment are under the information)
2016-11-29 06:34:20 +01:00
Laurent Destailleur
83972b39ce
Complete work on dol_banner. Fix errors due to missing columns.
2016-11-28 23:58:36 +01:00
aspangaro
fc0edc3499
Uniformize presentation of social contribution - Add button cancel in create mode
2016-11-28 21:27:02 +01:00
Laurent Destailleur
4eb397557f
Debug accounting module
2016-11-28 19:30:55 +01:00
Laurent Destailleur
6e43910932
FIX Filter was wrong or lost during navigation
2016-11-28 18:38:48 +01:00
gauthier
d8aa572ad7
FIX : fetch discount desappeared in develop...
2016-11-28 17:38:20 +01:00
gauthier
34a123759f
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:35 +01:00
gauthier
9a1309256d
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:09 +01:00
gauthier
3f6f1ac86f
fix : where fk_facture = object id
2016-11-28 17:12:17 +01:00
Laurent Destailleur
e59edca855
Fix Responsive design
2016-11-27 20:55:59 +01:00
Laurent Destailleur
663f7938f8
Fxi responsive design
2016-11-27 20:02:57 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
017b18d5c6
Fix #6037 #6041
2016-11-27 16:09:16 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
gauthier
c433829d27
NEW : interface
2016-11-25 11:04:42 +01:00
Laurent Destailleur
63d0622790
Fix phpcs
2016-11-24 19:48:28 +01:00
gauthier
480b08bd0b
NEW : convert exceiss received to reduc
2016-11-24 15:48:04 +01:00
Laurent Destailleur
60b1591f0e
Fix the notes must not be into the tooltip of ref.
2016-11-23 20:30:43 +01:00
Laurent Destailleur
2b944728fd
Fix code comment
2016-11-23 19:29:41 +01:00
Laurent Destailleur
cad4acffd2
FIX #6029
2016-11-22 20:40:45 +01:00
Laurent Destailleur
97034a7dff
FIX #6009
2016-11-22 20:17:20 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
7f5fd3bbc0
Fix selection of fields
2016-11-16 21:24:51 +01:00
Laurent Destailleur
3dc9bc89d8
Finished the selection of fields on bank account list
2016-11-16 19:56:03 +01:00
Laurent Destailleur
2961039b98
Code comment
2016-11-15 13:14:26 +01:00
Laurent Destailleur
af2f4cf78d
Merge branch 'patch-20' of https://github.com/defrance/dolibarr into
...
defrance-patch-20
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/install/mysql/tables/llx_facturedet.sql
2016-11-12 13:36:45 +01:00
Laurent Destailleur
35d80aa209
Miscellaneous fixes
2016-11-12 12:40:06 +01:00
Laurent Destailleur
2645b8cd1d
Fix syntax error
2016-11-12 11:12:22 +01:00
aspangaro
8909b4111d
Add options on getNomUrl
2016-11-12 10:41:57 +01:00
aspangaro
1dcf02af3a
Correct some mistakes
2016-11-12 08:05:25 +01:00
aspangaro
e13e66ce7b
Update works
2016-11-12 07:40:08 +01:00
aspangaro
137561aec9
Merge remote-tracking branch 'Upstream/develop' into 5.0-p35
2016-11-12 06:31:06 +01:00
Laurent Destailleur
97d84ab4ab
Better responsive design
2016-11-11 23:47:56 +01:00
Laurent Destailleur
cd9f1db229
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
614787c123
Merge pull request #5940 from aspangaro/5.0-p33
...
Correct typo
2016-11-11 14:26:33 +01:00
aspangaro
44a6bc8960
Cancel typo profit
2016-11-11 14:19:21 +01:00
Laurent Destailleur
2cfcca82b4
Fix list of linked object block
2016-11-11 02:18:48 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
florian HENRY
9daac25519
Fix translation for CRON
2016-11-10 08:31:08 +01:00
Laurent Destailleur
d1446bb7ef
NEW Show subtotal into list of linked elements
2016-11-08 19:19:30 +01:00
Laurent Destailleur
fcca3d6be1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-11-08 17:21:41 +01:00
Laurent Destailleur
6d70d39bbd
NEW Add type "url" as possible extrafield.
2016-11-08 17:21:26 +01:00
Laurent Destailleur
bf7916e310
Merge pull request #5959 from defrance/patch-39
...
bad tx_tva if PRODUIT_CUSTOMER_PRICES enabled...
2016-11-08 14:34:06 +01:00
Laurent Destailleur
c372d0ab8e
Fix clearing filters
2016-11-06 22:42:34 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
BENKE Charlie
f7294d5c3f
Update fiche-rec.php
2016-11-05 11:04:16 +01:00
BENKE Charlie
85c57e76e0
Update facture.php
2016-11-05 11:01:38 +01:00
aspangaro
5ed79800e0
Begin to wok on Vat expense report integration in reports
2016-11-05 07:48:42 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Laurent Destailleur
ebe3ed9ad4
Uniformize code
2016-11-04 17:48:20 +01:00
Laurent Destailleur
0f016bbbcb
Uniformise look and feel
2016-11-03 20:57:19 +01:00
Laurent Destailleur
6ceb79cf5a
Uniformise look and feel
2016-11-03 20:55:55 +01:00
Laurent Destailleur
59291be6e0
NEW Can filter on status on objects on the "statistics" page.
2016-11-03 19:50:04 +01:00
Laurent Destailleur
b4fbbe7391
Merge pull request #5947 from aspangaro/5.0-p34
...
Work on supplier credit/deposit/replacement invoice
2016-11-03 11:27:10 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
7c75d98f9a
FIX #5866
2016-10-29 18:43:12 +02:00
Laurent Destailleur
91ee1fae51
Fix feature to jump on a numbered page.
2016-10-29 17:46:11 +02:00
aspangaro
efd24e5922
Work on supplier credit note
2016-10-29 07:45:24 +02:00
aspangaro
52e0d1cec4
Correct typo
2016-10-29 06:06:44 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
Laurent Destailleur
854e75513b
Fix bad alias
2016-10-25 21:44:10 +02:00
Laurent Destailleur
43bf372cf7
Fix doxygen
2016-10-25 21:15:25 +02:00
Laurent Destailleur
f67863e1aa
NEW Can use any filter on all REST API to list.
2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
6338b04ac0
Remove call of a deprecated function
2016-10-24 11:27:39 +02:00
Laurent Destailleur
39bc78909b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d
Save information of vat code into database
2016-10-24 03:23:40 +02:00
Laurent Destailleur
4e23f1adf1
Merge pull request #5902 from aspangaro/5.0-p25
...
Better presentation of invoice payment page
2016-10-24 02:43:44 +02:00
Laurent Destailleur
9560ec54cc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-24 02:15:12 +02:00
Laurent Destailleur
939afa9569
NEW Can make reconcile directly from bank entry list
2016-10-23 23:24:55 +02:00
Laurent Destailleur
534202ad45
NEW Can make reconcile directly from bank entry list
2016-10-23 23:13:03 +02:00
Laurent Destailleur
8fa44e9363
Fix balance calculation
2016-10-22 17:56:12 +02:00
Laurent Destailleur
35601775e0
By default we open a new tab on external url link
2016-10-22 17:05:47 +02:00
Laurent Destailleur
14e78ef50b
Mutualize code of 2 lists into one page.
2016-10-22 13:52:43 +02:00
Laurent Destailleur
3219c07adc
FIX Avoid error if no data
2016-10-21 18:45:44 +02:00
Laurent Destailleur
f93bca9be9
NEW Can see/make bank conciliation from transaction list
2016-10-21 17:00:31 +02:00
aspangaro
b67c4ece8d
Fix: Missing Currency column
2016-10-21 07:04:08 +02:00
aspangaro
3cf44fcd3e
Fix: Missing Currency title
2016-10-21 07:02:43 +02:00
aspangaro
d1cafde77d
No rowspan needed
2016-10-21 06:39:39 +02:00
aspangaro
ad72a8eed1
Better presentation of invoice payment page
2016-10-21 06:34:02 +02:00
Laurent Destailleur
63628f6a01
Uniformize look and feel
2016-10-17 21:27:40 +02:00
Laurent Destailleur
17379cb5cd
Fix var_dump
2016-10-17 20:08:02 +02:00
Laurent Destailleur
70e5d29b28
Fix group by
2016-10-17 10:37:29 +02:00
Laurent Destailleur
47ed731242
Fix group by
2016-10-17 10:37:01 +02:00
Laurent Destailleur
4cf4090cde
Css
2016-10-17 00:21:39 +02:00
Laurent Destailleur
2592b4cba4
Fix field required only faor cheque payment mode
2016-10-16 21:39:19 +02:00
Laurent Destailleur
912ac8e3d6
Fix css
2016-10-16 21:29:12 +02:00
Laurent Destailleur
28933c31dd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/projet/card.php
2016-10-16 19:04:33 +02:00
aspangaro
380ab8bfa5
Fix: Show Ref/rowid of loan
2016-10-15 07:05:53 +02:00
aspangaro
849e46ab1d
Merge remote-tracking branch 'Upstream/develop' into 5.0-p21
2016-10-15 05:59:11 +02:00
aspangaro
38c75ffeb0
Fix: Missing td in list of bank account.
2016-10-15 05:57:10 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Laurent Destailleur
a7c6ecc177
Fix better compatibility with multicompany
2016-10-14 16:05:25 +02:00
Sergio Sanchis
63a7b506b1
Fix: Error if exist extrafield
2016-10-14 10:55:54 +02:00
Laurent Destailleur
28f64e78eb
Debug multicurrency
2016-10-13 21:25:13 +02:00
Laurent Destailleur
78e8ab64aa
Debug multicurrency
2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
Laurent Destailleur
94c5b40c51
Add warning
2016-10-10 21:22:28 +02:00
Laurent Destailleur
03876ba637
Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right
...
NEW : Reopen a paid bill is a user right
2016-10-07 13:31:10 +02:00
Laurent Destailleur
c908af6758
Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month
...
NEW Develop new cdr (current or next month) for payment terms.
2016-10-07 00:06:59 +02:00
Laurent Destailleur
611f1bcf89
Merge pull request #5836 from yanntech/fix/postgresql
...
replace double quote per simple quote in update_frequency SQL
2016-10-07 00:01:31 +02:00
Laurent Destailleur
93c848fcc5
Add page index for accountancy module
2016-10-06 17:43:10 +02:00
Laurent Destailleur
c982409c72
Fix a deadlock feature
2016-10-06 15:29:10 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
Laurent Destailleur
e79a84a89b
Uniformize code
2016-10-05 21:49:04 +02:00
Yann Verry
f4347ec60e
replace double quote per simple quote in update_frequency SQL
...
Fix #5835
2016-10-04 21:56:53 +02:00
Laurent Destailleur
31ce725d73
Maxi debug of accountancy expert module
2016-10-04 19:31:05 +02:00
gauthier
b35a4eb1b2
Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month
2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1
NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month
2016-10-04 15:45:23 +02:00
Laurent Destailleur
1e3038d634
Debug reports
2016-10-04 13:57:25 +02:00
Laurent Destailleur
3599f2c840
Uniformize code for recurring invoices
2016-10-04 12:31:45 +02:00
Laurent Destailleur
053e6783db
Fix INVOICE_US_SITUATION into INVOICE_USE_SITUATION
2016-10-04 11:30:51 +02:00
Laurent Destailleur
d81cd7ebbe
NEW Can link template invoice to other objects. Generated invoice will
...
be linked to same objects.
2016-10-04 11:14:00 +02:00
Laurent Destailleur
6ac39b97e4
Fix restore list of attached files into action report
2016-10-03 00:38:28 +02:00
Laurent Destailleur
a52ad545eb
Enhancement on module Direct Debit SEPA.
2016-10-02 13:03:45 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
03c60f1b7d
FIX #5802 Incoterms not set
2016-10-01 13:55:07 +02:00
Laurent Destailleur
5c9fa28e79
Fix search on invoice type
2016-09-29 10:38:15 +02:00
gauthier
03d126810c
FIX : "reopen " new right must respect advanced user rights management
2016-09-29 10:15:34 +02:00
aspangaro
31511a601d
Disable by default
2016-09-29 07:03:39 +02:00
aspangaro
210601f78b
New: Add type invoice in customer search list
2016-09-29 07:01:58 +02:00
Laurent Destailleur
b2307f9b90
Uniformize code
2016-09-28 21:08:25 +02:00
Laurent Destailleur
ce1f57786a
Merge pull request #5794 from mrsof/develop
...
NEW add confirm on reapeatable/template invoice deletion
2016-09-28 20:01:39 +02:00
Laurent Destailleur
05b1528029
Merge pull request #5800 from atm-gauthier/NEW_filters_on_ca_report
...
NEW : add fields and filters on ca by third report
2016-09-28 20:00:16 +02:00
Laurent Destailleur
e4f17c8763
FIX #5793 Normalise code.
2016-09-28 17:56:54 +02:00
gauthier
e82f65cef2
NEW : add field and filters on ca by third report
2016-09-27 17:38:54 +02:00
Sof
23dffa33a6
Fix : email adress
2016-09-26 19:32:31 +02:00
Sof
86a06de015
New : add confirm on invoice deletion
...
Alternatively reformated all code
2016-09-26 19:29:54 +02:00
gauthier
ad03bdf3b9
FIX : reopen invoice is an advanced right and default value is 1
2016-09-26 17:39:46 +02:00
Laurent Destailleur
e92184a738
Fix bad var $db
2016-09-26 14:55:36 +02:00
Laurent Destailleur
9b26db4151
Fix remove var_dump
2016-09-26 14:55:10 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
b50d92e712
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/localtax/index.php
2016-09-26 14:16:53 +02:00
Laurent Destailleur
5d7f182f59
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-09-26 14:14:56 +02:00
Laurent Destailleur
67a1bf2b59
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-09-26 14:13:26 +02:00
Laurent Destailleur
3cb13e16d1
Merge branch 'rest-api-add-accounts' of
...
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts
Conflicts:
htdocs/api/index.php
htdocs/commande/class/api_orders.class.php
2016-09-26 02:28:16 +02:00
Laurent Destailleur
d39d7d92c9
Uniformize code.
2016-09-26 02:13:58 +02:00
Laurent Destailleur
100312aac2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
813f9120f6
Merge pull request #5781 from aspangaro/5.0-p15
...
Typo "Execuete"
2016-09-26 00:51:40 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Xebax
fe2498ffc1
Fix coding style errors.
2016-09-25 19:11:16 +02:00
Xebax
58179f71fc
Add Accounts to REST API.
2016-09-25 17:48:48 +02:00
aspangaro
8dc6a8fd1d
Correct presentation
2016-09-24 14:47:51 +02:00
aspangaro
922495d72d
Correct travis & typo "Execuete"
2016-09-24 07:18:38 +02:00
gauthier
7ad2fda289
NEW : Reopen a paid bill is a user right
2016-09-22 15:06:39 +02:00
Laurent Destailleur
37a0df3277
Merge pull request #5761 from abilbaotm/patch-1
...
Fix Syntax error, unrecognized expression: input.remain]
2016-09-22 09:10:25 +02:00
Laurent Destailleur
d4e324d15a
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
Laurent Destailleur
d759296c02
Fix color of amount
2016-09-21 01:39:05 +02:00
Laurent Destailleur
1c15539bb4
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-09-21 01:27:25 +02:00
Laurent Destailleur
133657a8c7
Uniformize code
2016-09-21 01:25:34 +02:00
Laurent Destailleur
b5dad8cfbf
Better responsive
2016-09-21 00:29:19 +02:00
Laurent Destailleur
c2f4bc90ab
NEW Can sort on status reccurin invoice in list of template invoices.
2016-09-19 16:52:33 +02:00
Laurent Destailleur
64dc44b796
FIX Value of payment term and project are not set on correct default
...
value when invoice generated from template.
2016-09-19 16:27:01 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
95f2cae825
Start to work on sepa mandate generation
2016-09-19 00:26:30 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
537c6b0cc7
Uniformize code
2016-09-18 15:57:53 +02:00
Asier Bilbao
0a9fd2dc7e
Fix Syntax error, unrecognized expression: input.remain]
...
Fix
```
jquery.min.js?version=4.0.0:2 Uncaught Error: Syntax error, unrecognized expression: input.remain]
```
2016-09-18 15:51:55 +02:00
Laurent Destailleur
13c3db08e7
Uniformize code and look and feel
2016-09-18 15:48:29 +02:00
Laurent Destailleur
5146a0ce56
Fix filter on num account statement
2016-09-14 21:29:08 +02:00
Laurent Destailleur
145c1e1cc8
NEW Add account statement into fields of bank account transaction list
2016-09-14 21:26:57 +02:00
Laurent Destailleur
630aab9124
NEW Can select fields to show on list of bank transaction
2016-09-14 21:06:16 +02:00
Laurent Destailleur
39d47eab18
NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment
...
term on company level.
2016-09-14 11:17:44 +02:00
Laurent Destailleur
2facdda690
Uniformize code
2016-09-12 21:54:45 +02:00
Laurent Destailleur
0ab377440d
Complete param of setValueFrom
2016-09-12 20:16:39 +02:00
Laurent Destailleur
4096981378
FIX #3128
2016-09-12 03:10:18 +02:00
Laurent Destailleur
3d8722ee69
FIX #2853
2016-09-12 02:19:25 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
9252914a09
Fix avoid useless param if not defined
2016-09-11 13:30:14 +02:00
Laurent Destailleur
1ef0409b28
Merge pull request #5693 from atm-florian/dev_projectwork
...
Add projectid into link create from
2016-09-11 13:26:22 +02:00
Laurent Destailleur
926e3fc6f9
Fix date must be with standard format
2016-09-10 17:43:28 +02:00
Laurent Destailleur
41545e0d60
Fix compatibility of recurring invoices with postgresql
2016-09-10 05:26:31 +02:00
Laurent Destailleur
7c9996c840
Fix when creating recurring invoice, date next gen was not set
2016-09-10 05:25:07 +02:00
Laurent Destailleur
d821df070b
Fix multicompany: recurring invoice must be in same env than template.
2016-09-10 04:33:23 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Laurent Destailleur
4fe4907b44
FIX Mandatory field payment term was not css highlighted.
2016-09-08 18:13:23 +02:00
Laurent Destailleur
6d6eceb0ca
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-08 11:39:38 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
florian HENRY
8319d1f70a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_projectwork
2016-09-05 08:31:40 +02:00
Laurent Destailleur
f440e78fa6
FIX quick search boxes when nojs or when using smartphone
2016-09-03 12:56:49 +02:00
Laurent Destailleur
b107b0644f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:07:17 +02:00
florian HENRY
d360ff1d6c
Add projectid into link create from
2016-09-02 15:16:30 +02:00
philippe grand
959f4d0ba0
internationalized comments
2016-09-01 19:44:49 +02:00
Laurent Destailleur
91ede48390
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-01 11:37:40 +02:00
Laurent Destailleur
10ced563b3
Fix var $conf not defined
2016-08-31 19:39:12 +02:00
Laurent Destailleur
292993c14f
Fix var $conf not defined
2016-08-31 19:37:34 +02:00
Laurent Destailleur
545bc9d33d
Fix var conf not defined.
2016-08-31 19:36:21 +02:00
Laurent Destailleur
56d6510472
Fix Quick hack to solve legal problem in some countries.
2016-08-31 18:36:32 +02:00
Laurent Destailleur
8fd082cf16
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/hrm/hrm.php
2016-08-31 16:16:19 +02:00
Laurent Destailleur
95c2133b07
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-31 12:39:17 +02:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
aspangaro
3892f295c7
Uniformize presentation of customer's invoice
2016-08-31 06:27:35 +02:00
Juanjo Menent
ea6daeebbb
Merge pull request #5675 from aspangaro/4.0-p46
...
Fix: VAT Area - Problem of presentation
2016-08-31 02:12:19 +02:00
Juanjo Menent
1f67b025d7
Merge pull request #5672 from aspangaro/5.0-p4
...
Fix: Missing language key
2016-08-31 02:09:55 +02:00
Juanjo Menent
8155c09d49
Merge pull request #5671 from aspangaro/5.0-p3
...
Fix: Presentation on financial account
2016-08-31 02:08:33 +02:00
Juanjo Menent
eb23c8880d
Merge pull request #5670 from aspangaro/5.0-p1
...
Fix: Presentation on salaries payment index
2016-08-31 02:07:11 +02:00
Juanjo Menent
bb71e818dc
Merge pull request #5667 from aspangaro/5.0-p2
...
Remove the old file of ventilation module - Replace by advanced accou…
2016-08-31 02:06:28 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
124df446d7
Fix remove log
2016-08-30 18:12:26 +02:00
Laurent Destailleur
cb660cba86
NEW More filter on bank transaction list
2016-08-30 18:10:30 +02:00
Laurent Destailleur
b06cc18568
Fix sort on amount
2016-08-30 11:53:42 +02:00
aspangaro
b85e9938e8
Fix: VATArea - Problem of presentation
2016-08-30 05:17:27 +02:00
Laurent Destailleur
216f7dbaee
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-30 00:21:56 +02:00
Laurent Destailleur
d7007bd16b
Fix lang not loaded
2016-08-30 00:21:26 +02:00
aspangaro
cfcd9677f1
Fix: Missing language key
2016-08-29 21:54:52 +02:00
aspangaro
358bcee3a5
Presentation on financiel account
2016-08-29 21:49:34 +02:00
aspangaro
31a895dddc
Merge remote-tracking branch 'Upstream/develop' into 5.0-p1
2016-08-29 21:21:10 +02:00
aspangaro
5eb0e4ad87
Fix: Presentation on salaries payment index
2016-08-29 21:14:11 +02:00
Laurent Destailleur
ff0b424f74
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-29 18:18:35 +02:00
Laurent Destailleur
6b7d509e44
Fix css
2016-08-29 18:12:53 +02:00
Laurent Destailleur
b43bd371fd
Merge pull request #5666 from aspangaro/4.0-p45
...
Fix: Wrong language key
2016-08-29 17:47:49 +02:00
Laurent Destailleur
9c1ba67169
Fix css
2016-08-29 16:40:51 +02:00
aspangaro
14e6e705c3
Remove the old file of ventilation module - Replace by advanced accountancy module
2016-08-29 07:44:09 +02:00
aspangaro
7cb4f85f6b
Fix: Wrong language key
2016-08-29 07:30:39 +02:00
Laurent Destailleur
4215ec3ca9
FIX usage of sepa generation setup.
2016-08-28 20:12:25 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
phf
7813f0be27
Fix deprecated value given to dol_print_date
2016-08-25 10:07:19 +02:00
Laurent Destailleur
e22e243bc5
NEW Can set to paid automaically social or fiscal contributions after a
...
payment was recorded.
2016-08-22 14:31:15 +02:00
Laurent Destailleur
03c30c487c
Uniformise code
2016-08-22 13:46:38 +02:00
Laurent Destailleur
317132fea4
CSS
2016-08-22 12:25:54 +02:00
Laurent Destailleur
f06545a3fe
Fix cancel button ignored
2016-08-19 17:22:53 +02:00
Laurent Destailleur
83107746ad
Fix no way to fix the ref of recurring invoice when an error was done
...
into typing.
2016-08-19 16:18:39 +02:00
BENKE Charlie
45a0df53d8
Update facture.class.php
2016-08-17 16:42:02 +02:00
Laurent Destailleur
88afc4ad5a
Merge pull request #5625 from aspangaro/4.0-p42
...
Uniformize presentation, add button cancel everywhere
2016-08-17 16:11:59 +02:00
Laurent Destailleur
47489265b1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-17 11:15:30 +02:00
aspangaro
b7420372b7
Uniformize presentation, add button cancel everywhere
2016-08-12 22:53:30 +02:00
Juanjo Menent
adc0a73e93
Merge pull request #5603 from atm-florian/4.0_FIX_Multicurrency_with_french_number_setting
...
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
2016-08-11 20:42:25 +02:00
Laurent Destailleur
86c90ade3f
Another fix on bank account missing when bank module enabled.
2016-08-11 18:41:31 +02:00
Laurent Destailleur
4df9af1ba0
Fix several errors with bank account module enabled on sale tax edition
2016-08-11 18:18:03 +02:00
Laurent Destailleur
f674b24945
Fix look and feel
2016-08-11 17:23:42 +02:00
florian HENRY
5bb3b5c074
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
2016-08-10 09:47:25 +02:00
aspangaro
43ffb061ef
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
2016-08-10 08:07:27 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
BENKE Charlie
025a0dc0b4
Update facture.class.php
2016-08-07 14:36:48 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8
NEW Support mass actions for proposals
2016-08-05 13:08:23 +02:00
Laurent Destailleur
782ab6a02b
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/barcode/modules_barcode.class.php
htdocs/product/admin/product.php
2016-08-05 00:42:40 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
86f576f8d3
Fix strict sql
2016-08-02 13:45:35 +02:00
Laurent Destailleur
dfc38351ef
Fix $i not initialized
2016-08-01 19:48:39 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
bb99209b5e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-01 15:06:22 +02:00
Laurent Destailleur
621a7d93fa
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-08-01 15:05:57 +02:00
Laurent Destailleur
97dd1f4bbb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:03:59 +02:00
BENKE Charlie
9a0494bd64
Update bonprelevement.class.php
2016-08-01 14:11:58 +02:00
aspangaro
8ce5fcd980
Uniformize presentation salary payment
2016-08-01 07:40:05 +02:00
aspangaro
4a0eb496fa
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36
...
Conflicts:
htdocs/societe/rib.php
2016-08-01 07:27:49 +02:00
aspangaro
3cdb2d45c2
Uniformize presentation customer invoice
2016-08-01 07:10:42 +02:00
Laurent Destailleur
33495847b7
Merge branch '4.0-p36' of https://github.com/aspangaro/dolibarr into
...
aspangaro-4.0-p36
Conflicts:
htdocs/societe/rib.php
2016-07-31 03:05:34 +02:00
Laurent Destailleur
e5583f1544
Fix bad translation. Confusionbetween internal tranfert and bank
...
tranfert for payements
2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607
Fix multicurrency
2016-07-30 16:41:10 +02:00
Laurent Destailleur
5b4c215526
Fix size of field too small and bad translation
2016-07-30 10:31:56 +02:00
aspangaro
3c3df0c4f6
Fix Presentation
2016-07-29 23:52:49 +02:00
Laurent Destailleur
69247afd06
FIX #4447
2016-07-29 17:26:24 +02:00
Laurent Destailleur
b85bb8c0f8
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Juanjo Menent
21084f9372
Merge pull request #5559 from defrance/patch-18
...
FIX : Bad folders name (repeat /receipts 2 times)
2016-07-29 08:37:31 +02:00
Laurent Destailleur
4e8e7f8e05
NEW New REST API explorer. Can create invoice and orders with lines.
2016-07-29 02:28:51 +02:00
Laurent Destailleur
80ac99e9b1
Fix missing field into response
2016-07-28 23:50:17 +02:00
Laurent Destailleur
9ca7f2cb66
Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by
...
default).
2016-07-28 19:02:23 +02:00
Ferran Marcet
5bc51a3439
FIX: Can't create withdrawal document
2016-07-28 16:56:23 +02:00
Laurent Destailleur
f54946bacb
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
2016-07-28 10:10:58 +02:00
BENKE Charlie
3e13877f3c
Update fiche-stat.php
2016-07-27 22:32:58 +02:00
BENKE Charlie
a3dea2c648
Update fiche-rejet.php
2016-07-27 22:32:42 +02:00
BENKE Charlie
c7a70fd5a3
suffix left on url
2016-07-27 22:32:17 +02:00
BENKE Charlie
c1c44ce996
Update bonprelevement.class.php
2016-07-27 22:24:48 +02:00
BENKE Charlie
457a48c9ac
Bad folders name (repeat /receipts 2 times)
2016-07-27 22:17:25 +02:00
Laurent Destailleur
fb8f0ed657
FIX #5503
2016-07-27 20:05:22 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
e65a8400e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-27 14:09:51 +02:00
Laurent Destailleur
ee0c77a305
Merge branch 'refactor-rest-api' of
...
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api
Conflicts:
htdocs/api/admin/explorer.php
2016-07-27 14:06:14 +02:00
Laurent Destailleur
5a36aa7780
Merge pull request #5548 from atm-arnaud/FIX_facture_thirdparty_parent_if_empty
...
Update paiement.php
2016-07-27 11:56:55 +02:00
SAINT-PATRICE
d363205648
Update paiement.php
...
Test non optimisé
2016-07-26 11:55:26 +02:00
florian HENRY
419dd3095b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/societe/class/societe.class.php
2016-07-26 08:59:40 +02:00
Laurent Destailleur
e0f5a3cfe9
Fix send email in mass action
2016-07-25 21:51:29 +02:00
Laurent Destailleur
f0a3a5ce02
NEW Mutualize mass action. So "Send by email" is also avavilable on
...
orders.
2016-07-25 21:50:41 +02:00
Laurent Destailleur
a82e551a54
Start to work to mutualize code of mass actions
2016-07-25 19:43:07 +02:00
Regis Houssin
d8f77abf31
Fix: missing sourcetype can create fault positive
2016-07-25 14:36:20 +02:00
Marcos García de La Fuente
b1c552ee9d
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/install/mysql/tables/llx_product_attribute.key.sql
# htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
2016-07-24 11:54:38 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Laurent Destailleur
9b17d8dcc3
Fix code lost
2016-07-23 12:24:26 +02:00
Laurent Destailleur
08d23b482b
NEW Introduce mass action "delete" on sales orders.
2016-07-23 12:17:47 +02:00
Laurent Destailleur
5bbd8eded9
Code comment
2016-07-22 18:32:45 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
774e327831
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/compta/facture.php
htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
a290757d2d
Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany
...
NEW Option to allow payment on bills of different companies (with same parent company)
2016-07-20 19:34:51 +02:00
Laurent Destailleur
b90ed8d677
Merge pull request #5375 from frederic34/charges
...
NEW select bank and payment mode for social contrib
2016-07-20 19:00:10 +02:00
florian HENRY
5ea72c8d56
FIX : cannot update bank account on invoice if module order not
...
activated
2016-07-19 07:46:27 +02:00
Laurent Destailleur
621a29d0e0
Fix account may contains text
2016-07-18 12:01:25 +02:00
Juanjo Menent
e5235be7d0
Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency
...
FIX : class FactureLine fetch() and update() crash
2016-07-18 08:56:15 +02:00
florian HENRY
d3344f5291
sd
2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce
fix problem with call update method after fetch on invocie lines
2016-07-18 07:37:18 +02:00
aspangaro
e6da7c5574
Fix: Accountancy - Problem with empty accountancy acccount in create / modify mode
2016-07-17 07:09:17 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
4b854fb33d
Fix better error message when possible refering objects list is empty.
2016-07-16 14:37:35 +02:00
frederic34
cf8fb5c230
Merge remote branch 'upstream/develop' into charges
2016-07-15 09:57:27 +02:00
Laurent Destailleur
dd7c7b9d4b
Merge pull request #5467 from atm-florian/add_update_trigger
...
NEW : review Propal/Order/Invoice class to be uniformize on triggers calls
2016-07-14 23:00:11 +02:00
Juanjo Menent
df74fa37de
Merge pull request #5464 from AppChecker/develop
...
Fix: Prevent SQLi
2016-07-13 08:45:00 +02:00
Laurent Destailleur
73f574b649
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/repair.php
2016-07-12 19:30:01 +02:00
Alexis Algoud
572b2fdec7
FIX dasboard wrong for late invoice
2016-07-12 15:01:43 +02:00
appchecker
f618f330b3
replace intval with GETPOST
2016-07-11 13:01:16 +03:00
florian HENRY
10b0e5dd57
clean trigger and normalize code
2016-07-08 21:28:21 +02:00
florian HENRY
2d9876d127
clean command class
2016-07-08 21:02:27 +02:00
florian HENRY
195d6187a3
NEW : Uniformize code and correct deal with triggers
2016-07-08 20:40:25 +02:00
appchecker
2c297bbcc8
prevent SQLi
2016-07-07 20:25:15 +03:00
florian HENRY
1bb28648c4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
build/pad/DoliWamp.pml
build/pad/Dolibarr.pml
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
2016-07-07 09:05:13 +02:00
Laurent Destailleur
6749e60079
Fix: Test to manage corrupted data
2016-07-05 18:36:10 +02:00
Laurent Destailleur
a669b61b69
Code comment
2016-07-05 18:33:13 +02:00
Laurent Destailleur
b4c8822281
Fix style of text after ref on invoices
2016-07-05 16:27:14 +02:00
florian HENRY
afb924043f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/core/modules/mailings/advthirdparties.modules.php
2016-07-04 20:43:14 +02:00
Laurent Destailleur
76d24ac8ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3
Fix NNE has been replaced with ICS
2016-07-02 11:26:55 +02:00
florian HENRY
32e954c8d8
Merge branch 'develop' of local repository into dev_fix5353
2016-07-01 15:08:15 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
Laurent Destailleur
5c11192c7c
Merge pull request #5425 from atm-arnaud/fix_4749
...
FIX #4749
2016-06-30 22:20:18 +02:00
florian HENRY
215f397f33
Cannot reproduce 4793 still fix other bug on PgSQL
2016-06-30 17:28:13 +02:00
Maxime Kohlhaas
d004f3a538
FIX #4448 $filebonprev is not used, $this->filename now
2016-06-30 17:03:56 +02:00
florian HENRY
12aee3e76c
ibazn managment
2016-06-30 16:07:53 +02:00
arnaud
0ffe106e2c
FIX #4749
2016-06-30 16:03:48 +02:00
florian HENRY
1e4916bd53
better way to manamge IBAN/BIC Mandatory
2016-06-30 16:01:53 +02:00
florian HENRY
d431e73ec8
Fix #5353
2016-06-30 15:49:57 +02:00
Laurent Destailleur
8bcd2e581f
Fix of bugs reported by scrutinizer
2016-06-29 11:20:48 +02:00
Laurent Destailleur
2c97d0855a
Fix: On template invoice, edition of line was not complete.
2016-06-28 17:51:29 +02:00
Laurent Destailleur
b529a53501
Fix var not initialized
2016-06-28 02:36:40 +02:00
Laurent Destailleur
5222b78e95
FIX property of bank account were lost if an error occured during
...
saving.
2016-06-25 14:20:23 +02:00
Laurent Destailleur
1368e6d462
Fix: error message was not enough to understand
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b
Fix: error message was not enough to understand
2016-06-24 17:04:59 +02:00
Laurent Destailleur
e144df759c
FIX forced bank account was lost on proposal
...
Fix Invoice was using duplicated bugged code for pdf removal link.
2016-06-24 12:50:50 +02:00
Laurent Destailleur
3b38e5a870
FIX Withdraw request should not be possible if amount is negative.
2016-06-24 03:00:34 +02:00
Laurent Destailleur
2e4c6597d8
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2016-06-23 21:05:00 +02:00
Laurent Destailleur
f6119cfee8
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2016-06-23 21:03:08 +02:00
Laurent Destailleur
9b50150fe8
FIX #5380
2016-06-23 20:54:04 +02:00
Laurent Destailleur
4a408e76e7
Fix download of mass generated files.
2016-06-22 21:06:08 +02:00
Juanjo Menent
0d62bd704e
Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
2016-06-22 18:59:51 +02:00
Xebax
e12e1980fc
REST API: Add comments in the @deprecated tags.
2016-06-22 10:43:35 +02:00
Xebax
70ba8ec78d
REST API: Bring back the existing API (for backward compatibility).
...
Bring back the existing API and mark all the operations as deprecated.
Both the existing and the new API are documented and browsable with the
Restler API Explorer. The existing API appears under "root".
2016-06-22 10:08:54 +02:00
Laurent Destailleur
52f414ad73
Fix selection of visible fields on customer and supplier lists. Filters
...
are ok now. Order of list of fields in selection is same than in output
array.
2016-06-21 15:16:33 +02:00
Laurent Destailleur
b953e8f364
Minor fix
2016-06-21 12:15:41 +02:00
Laurent Destailleur
73fb7b2615
Fix phpunit regression. phpunit test on ws invoice is cleaner.
2016-06-21 01:07:44 +02:00
Xebax
8cf0bceadd
REST API: replace the /invoice/ API by /invoices/.
...
Rename the 'mode' parameter to 'status' in GET /invoices.
Fix the error handling in DELETE /invoices/{id}.
2016-06-20 17:56:33 +02:00
Laurent Destailleur
b01eed697e
Fix sort on thirdparty on bank transaction list
2016-06-20 11:30:43 +02:00
frederic34
e71833c0d9
typo
2016-06-19 20:24:20 +02:00
frederic34
77071ca515
select bank and payment mode for social contrib
2016-06-19 18:53:19 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
4a6427134f
Merge pull request #5367 from atm-florian/develop
...
FIX bug with PgSQL on GROUP BY missing column
2016-06-18 18:09:43 +02:00
Laurent Destailleur
4382f2a437
Clean language files
2016-06-18 11:06:11 +02:00
florian HENRY
d94953c4d7
FIX bug with PgSQL on GROUP BY missing column
2016-06-17 13:33:48 +02:00
Raphaël Doursenaud
eb54c3f8af
Fix #5350 date_pointoftax prevented creating invoices
2016-06-16 13:09:11 +02:00
Laurent Destailleur
232f525f29
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Laurent Destailleur
630a063283
FIX Can't create thirdparty or validate invoice if profid is mandatory
...
and profid does not exists for other countries
Conflicts:
htdocs/compta/facture.php
2016-06-15 18:24:15 +02:00
Laurent Destailleur
4c922f073b
FIX Can't create thirdparty or validate invoice if profid is mandatory
...
and profid does not exists for other countries
2016-06-15 18:21:58 +02:00
gauthier
b8f5175343
FIX : sql optimisation
2016-06-15 17:16:16 +02:00
gauthier
a0051a856a
NEW : conf to allow payments on different thirdparties bills but same parent company
2016-06-15 17:10:42 +02:00
Laurent Destailleur
44503cb43c
Fix missing "back to list" link
2016-06-14 20:49:34 +02:00
Laurent Destailleur
6034ba658c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-06-10 18:59:05 +02:00
Laurent Destailleur
fd4973c413
Fix missing total
2016-06-09 07:50:54 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
ad001ed4dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-07 14:06:17 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
18f1ee1685
Merge pull request #5316 from atm-gauthier/develop_fix_deplacement_list
...
FIX : if user is only allowed to see his companies, he must be allowe…
2016-06-07 00:43:17 +02:00
Laurent Destailleur
a8541fcaeb
Merge pull request #5315 from atm-gauthier/develop_fix_usercard_link_on_deplacement
...
FIX : wrong id user deplacement links
2016-06-07 00:27:08 +02:00
Laurent Destailleur
559c1aa010
Fix alignetment of title in some arrays
2016-06-06 16:37:18 +02:00
Laurent Destailleur
fb13225173
Fix links on list from warnings dashboard
2016-06-06 16:31:50 +02:00
gauthier
07d07d522a
FIX : if user is only allowed to see his companies, he must be allowed to see deplacement which are not linked to a company
2016-06-06 16:31:42 +02:00
gauthier
b153ae8c6b
FIX : wrong id user deplacement links
2016-06-06 16:12:27 +02:00
Laurent Destailleur
47308d27c3
Missing column import_key and import for vat payments
2016-06-06 14:37:06 +02:00
Laurent Destailleur
4416925a85
Merge pull request #5314 from fmarcet/peru
...
Fix: Missing userid on query
2016-06-06 13:40:20 +02:00
Laurent Destailleur
293534273f
Merge pull request #5313 from aspangaro/4.0-p33
...
Fix: colspan in vat list of payments
2016-06-06 13:39:07 +02:00
Your Name
68fa27ec03
Fix: Missing userid on query
2016-06-06 12:00:24 +02:00
Laurent Destailleur
9c88eadbe4
Fix: button to generate invoice manually must be disabled if we reach
...
max number of generation.
2016-06-06 11:48:39 +02:00
Laurent Destailleur
a0458be943
Fix object not defined
2016-06-06 11:25:54 +02:00
aspangaro
3b3567a718
Fix: colspan
2016-06-05 15:50:32 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
c59c86e648
Merge branch 'develop' of https://github.com/aschio/dolibarr into
...
develop
Conflicts:
htdocs/fourn/facture/list.php
2016-06-04 14:55:02 +02:00
Maxime Kohlhaas
bd2fe75d08
Fix menus in dashboard links
2016-06-04 14:45:03 +02:00
Laurent Destailleur
674164b71c
Add a better explanation on job generation
2016-06-04 14:30:05 +02:00
Laurent Destailleur
975d9357fa
FIX On recurring invoice, when generation is done manually from card,
...
counter of number of generation must be +1
2016-06-04 14:08:57 +02:00
Juanjo Menent
43d475aa42
Merge pull request #5272 from simnandez/3.9
...
Fix issues with strict mode
2016-06-04 10:07:01 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/list.php
htdocs/fourn/ajax/getSupplierPrices.php
2016-06-04 00:58:16 +02:00
Juanjo Menent
66c73015b2
Fix issues with strict mode
2016-06-03 23:58:54 +02:00
Laurent Destailleur
448c394f2a
Fix date of recurrin invoice
2016-06-03 22:10:33 +02:00
Laurent Destailleur
a5d7c303e7
FIX Button must be out of tabs
2016-06-02 21:11:14 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Laurent Destailleur
7519c4a602
FIX Log of tax
...
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
2016-06-01 13:24:27 +02:00
Laurent Destailleur
460d7ce915
FIX Split of credit note into discount page generates records not
...
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
2dcc578b88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-30 00:52:59 +02:00
Laurent Destailleur
3ddf427ff1
FIX Legal issue for GB. Add hidden option for this.
2016-05-30 00:52:16 +02:00
Laurent Destailleur
0c6e8b626a
Fix var not initialized
2016-05-29 11:20:27 +02:00
gauthier
71ee941cf8
FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty
2016-05-25 12:25:39 +02:00
Laurent Destailleur
3abe1d8e81
Merge pull request #5220 from fmarcet/expenses
...
The approved status is enough to expense appear in the report
2016-05-22 14:22:38 +02:00
Laurent Destailleur
7935967c62
Fix duplicate translation key
2016-05-21 12:30:58 +02:00
Your Name
106f456c6b
Last change
2016-05-19 16:50:18 +02:00
Laurent Destailleur
400572e18a
Fix column size
2016-05-18 21:04:37 +02:00
Laurent Destailleur
4c2098b667
Fix duplicate table title
2016-05-18 20:58:29 +02:00
Laurent Destailleur
7cca4f3e8a
Merge pull request #5211 from defrance/patch-4
...
enhance rappro feature
2016-05-18 20:38:07 +02:00
Your Name
c2b958a039
Correction compatibility Postgresql
2016-05-18 18:52:38 +02:00
Your Name
23311cdba1
Merge remote-tracking branch 'origin/develop' into expenses
2016-05-18 18:46:05 +02:00
Laurent Destailleur
acae888b3a
Fix phpunits
2016-05-17 23:38:07 +02:00
Your Name
c30a3a5f7e
Expense report grouped by user
2016-05-17 10:02:36 +02:00
Laurent Destailleur
f9ded46a99
Start debug 4.0
2016-05-17 02:41:06 +02:00
Your Name
e1fa86914e
The approved status is enough to expense appear in the report
2016-05-16 18:41:41 +02:00
BENKE Charlie
a1ce4000e1
NEW : Add list of billed
...
Very usefull when we have many rappro
Maybe do the same on other paiement
2016-05-14 10:14:10 +02:00
BENKE Charlie
0944463805
Add : rappro order list
2016-05-14 10:06:35 +02:00
Laurent Destailleur
6bb269381a
Merge pull request #5143 from frederic34/morecateg
...
categories account like other categories
2016-05-07 20:25:17 +02:00
Juanjo Menent
fd6dbf5d1a
Fix Remove unused variables
2016-05-06 22:59:03 +02:00
Frédéric FRANCE
2f3a2303d4
put colspan in td instead tr
2016-05-04 16:49:15 +02:00
Laurent Destailleur
a8363052c6
Better style
2016-04-30 15:55:39 +02:00
frederic34
17463b4927
categories account like other categories
2016-04-30 14:45:24 +02:00
Laurent Destailleur
e61e717cac
FIX Bad permission to edit bank account on customer invoice
2016-04-30 14:28:48 +02:00
Laurent Destailleur
6ffb45f5d8
FIX Missing param user on update()
2016-04-30 13:58:35 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/expedition/class/expedition.class.php
htdocs/index.php
2016-04-29 20:39:17 +02:00
Laurent Destailleur
b0b1056a44
Merge pull request #5121 from fmarcet/3.7
...
Fix: Not filtering correctly on supplier invoice's list
2016-04-29 17:19:15 +02:00
Juanjo Menent
6d58103d11
Merge pull request #5091 from marcosgdf/fr-4972
...
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
2016-04-29 12:03:04 +02:00
Juanjo Menent
08a875b813
Merge pull request #5084 from atm-maxime/new_remaintopay_invoice_list
...
New add remain to pay column in invoice list
2016-04-29 12:00:53 +02:00
Juanjo Menent
a33df1401b
Merge pull request #5079 from marcosgdf/fix-undefined-variable
...
Fixed undefined $user variable in Account::countAccountToReconcile
2016-04-29 11:58:48 +02:00
Juanjo Menent
9909143c42
Merge pull request #5076 from aspangaro/4.0-p21
...
FIX: For external api, don't use lengt_accountg without module accountancy activated
2016-04-29 11:55:55 +02:00
fmarcet
33499ae652
FIX: Compatible with multicompany
2016-04-28 11:14:00 +02:00
Maxime Kohlhaas
0a67614e72
Fix wrong qty total in ca by prod/serv report
2016-04-28 09:10:22 +02:00
Laurent Destailleur
aa31a7e9c5
Finished list of template invoices
2016-04-27 20:09:55 +02:00
Laurent Destailleur
7608366e70
Fix pagination
2016-04-27 19:34:38 +02:00
Laurent Destailleur
9987c9b77a
Can sort on field of recurring invoices
2016-04-27 17:36:05 +02:00
Laurent Destailleur
60e693e9a4
Minor fixes on recurring invoices
2016-04-27 11:35:11 +02:00
Laurent Destailleur
bdb7fe8d29
Missing public note on recurring invoices
...
Can change position of lines in recurring invoices
2016-04-27 11:07:20 +02:00
Laurent Destailleur
11217db8c4
FIX: when creating project from template/recurring invoice creation, we
...
lost information we were working in template/recurring invoice.
2016-04-27 10:56:40 +02:00
Laurent Destailleur
78cda5dc07
Fix problem with code of reccuring invoices
2016-04-26 22:00:41 +02:00
Laurent Destailleur
c73f4e5d7b
FIX Project was lost when creating invoice from a template
...
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
Laurent Destailleur
ccdbf69cd5
Bette explanation on how to create an repeatable invoice
2016-04-24 18:11:19 +02:00
Marcos García de La Fuente
82ee964c27
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
...
Close #4972
2016-04-23 18:22:11 +02:00
Maxime Kohlhaas
c5787a4bba
New add remain to pay column in invoice list (was present in previous versions)
2016-04-23 16:02:18 +02:00
Marcos García de La Fuente
f195107bd1
Fixed undefined $user variable in Account::countAccountToReconcile
2016-04-23 13:25:23 +02:00
aspangaro
2a7c7a0748
Same problem on bank
2016-04-23 08:09:38 +02:00
Laurent Destailleur
5bfc65676c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Laurent Destailleur
63d04f4f2d
Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client
...
Fix order creation bug because of ->client
2016-04-22 19:20:48 +02:00
Laurent Destailleur
da14f247bb
Merge pull request #5070 from atm-maxime/fix_display_payment_on_invoices
...
Fix payment display on customer invoice and replicate on supplier inv…
2016-04-22 19:19:46 +02:00
Laurent Destailleur
ec407af81a
Merge pull request #5072 from atm-maxime/fix_bank_releve_display
...
Fix bank statement display
2016-04-22 19:12:56 +02:00
Laurent Destailleur
25b7f0ab62
FIX Remove a total that has no sense
2016-04-22 17:11:12 +02:00
Maxime Kohlhaas
5904f33039
Fix bank statement display
2016-04-22 11:44:23 +02:00
Maxime Kohlhaas
fc7056650e
Fix payment display on customer invoice and replicate on supplier invoice
2016-04-22 10:42:06 +02:00
Maxime Kohlhaas
e881701968
Fix pdf generation with thirdparty
2016-04-22 09:46:47 +02:00
Laurent Destailleur
dd443fe7f5
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/localtax/quadri_detail.php
2016-04-21 02:42:43 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
0c932e0ee6
Merge pull request #4997 from atm-maxime/fix_vat_on_credit_note
...
Fix VAT amount on credit note was > 0 when manually entered
2016-04-19 19:21:05 +02:00
Laurent Destailleur
005751f330
Merge pull request #4963 from altatof/add_filter_type_on_turnover_report
...
NEW: add product type filter on turnover report
2016-04-19 19:15:04 +02:00
Laurent Destailleur
d40e659b30
Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring
...
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-04-19 19:11:54 +02:00
Frédéric FRANCE
18b3b3a31d
Update rappro.php
2016-04-18 08:14:02 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Juanjo Menent
ecbf5996c1
FIX #4961
2016-04-15 17:20:37 +02:00
Juanjo Menent
9f4ccfab95
FIX #3815 With higher quality
2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22
FIX #3815 With higher quality
2016-04-15 15:42:58 +02:00
Juanjo Menent
4446e6a36c
FIX #3815 Call to undefined function local_by_date(). branch 3.8
2016-04-15 12:47:21 +02:00
Juanjo Menent
2d3b2c08b5
FIX #3815 Call to undefined function local_by_date(). branch 3.7
2016-04-15 10:56:03 +02:00
Maxime Kohlhaas
9de6d31c87
New add link to widthdraw slip card on bank transaction
2016-04-13 15:57:46 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Maxime Kohlhaas
25dcca301f
Fix VAT amount on credit note was > 0 when manually entered
2016-04-12 09:47:35 +02:00
Christophe Battarel
0dd25a7e70
add new filter in GROUP BY clause
2016-04-12 09:39:48 +02:00
Laurent Destailleur
46dd3c0cec
Merge pull request #4982 from marcosgdf/bug-4737
...
FIX #4737 Bank transacion type selector translation is cropped
2016-04-11 18:58:26 +02:00
Juanjo Menent
4f5d96150a
Merge pull request #4977 from marcosgdf/bug-4766
...
FIX #4766 VAT not shown in supplier invoice popup
2016-04-10 11:42:29 +02:00
Marcos García de La Fuente
a41a80b8fe
Merge branch 'develop' into oop-refactor-bankaccount-tostring
2016-04-09 23:17:09 +02:00
Marcos García de La Fuente
3135cf720d
FIX #4737 Bank transacion type selector translation is cropped
...
Close #4737
2016-04-09 22:59:12 +02:00
Marcos García de La Fuente
9169adf4ce
FIX #4766 VAT not shown in supplier invoice popup
...
Close #4766
2016-04-09 22:34:55 +02:00
Laurent Destailleur
dd1f946afe
Clean dead code
2016-04-09 19:06:40 +02:00
Laurent Destailleur
724610ba5b
Quality fixes reported by scrutinizer
2016-04-09 15:07:55 +02:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
01e538fa78
Merge pull request #4942 from aspangaro/4.0-p16
...
NEW: Move HRM area page in HRM directory
2016-04-08 20:51:17 +02:00
Laurent Destailleur
104e34fe22
Fix css and missing link "go to list"
2016-04-08 03:40:23 +02:00
Laurent Destailleur
7a48ceb635
Uniformize code for mass actions
2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0
NEW Can select fields to show on list also for list of customer orders,
...
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0
Work on select fields for orders, invoices and shipments
2016-04-08 01:00:02 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
39b61d6924
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/boxes/box_task.php
htdocs/core/lib/files.lib.php
2016-04-07 19:27:53 +02:00
Christophe Battarel
d052eac6fc
NEW: add product type filter on turnover report
2016-04-07 14:57:41 +02:00
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +02:00
Laurent Destailleur
1a1dc39a6b
Mark a duplicate function as deprecated
2016-04-06 14:53:14 +02:00
aspangaro
a85575a93c
Merge remote-tracking branch 'Upstream/develop' into 4.0-p16
2016-04-04 05:31:12 +02:00
aspangaro
c6aabd3f34
NEW: Move HRM area page in HRM directory
2016-04-04 05:29:12 +02:00
Ion Agorria
fbe0414a1f
Change FactureRec superclass CommonInvoice
2016-04-03 21:02:19 +02:00
Juanjo Menent
314069f1da
Qual: Remove unused function
2016-04-03 15:47:07 +02:00
Juanjo Menent
305bbf1450
Fix Doc
2016-04-03 12:39:39 +02:00
Juanjo Menent
e8b2d6baab
NEW #3510 : Working
2016-04-03 12:22:18 +02:00
Juanjo Menent
9d189b3c04
NEW #3510 : Working
2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb
NEW #3510 : Working
2016-04-03 11:56:31 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Frédéric FRANCE
d4529d19c7
Update facture.php
...
ref_client in order
ref_customer in shipping
2016-04-01 17:32:58 +02:00
Laurent Destailleur
e40b678d7b
Uniformize code
2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8
Uniformize code and css
2016-04-01 16:18:45 +02:00
Laurent Destailleur
27ed9ba3da
Remove now link useless here
2016-04-01 12:13:43 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Juanjo Menent
dc491fbae9
Merge pull request #4887 from defrance/patch-111
...
NEW : INVOICE_CAN_NEVER_BE_CANCELED global
2016-03-26 09:51:36 +01:00
BENKE Charlie
767ce063df
Change done
2016-03-25 18:16:05 +01:00
Laurent Destailleur
6a58b025f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-25 18:10:50 +01:00
Laurent Destailleur
bc1b2d048b
Uniformise option name
2016-03-25 18:09:42 +01:00
Laurent Destailleur
f61f1c7a27
Merge pull request #4857 from marcosgdf/bankacc-misc
...
Little refactor
2016-03-25 17:43:56 +01:00
Laurent Destailleur
30aea901b8
Merge pull request #4855 from marcosgdf/account-oop
...
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-25 17:41:39 +01:00
Laurent Destailleur
a0563b410e
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:24:26 +01:00
Laurent Destailleur
884ba3a0ba
Fix bad hook function name
2016-03-25 16:23:09 +01:00
Laurent Destailleur
a2d6cf8549
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:17:17 +01:00
Laurent Destailleur
9ddae7d7f3
Fix bad hook function name
2016-03-25 16:17:01 +01:00
Laurent Destailleur
7ca1e27103
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:15:54 +01:00
Laurent Destailleur
f251ca579b
Fix bad hook function name
2016-03-25 16:15:35 +01:00
Laurent Destailleur
ea9db792be
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:14:37 +01:00
Laurent Destailleur
7430d09739
Fix bad hook function name
2016-03-25 16:13:22 +01:00
Laurent Destailleur
85cd0038f5
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:10:10 +01:00
Laurent Destailleur
5e55f0ecce
Fix bad function name into hook
2016-03-25 16:07:42 +01:00
Laurent Destailleur
61bc8fc9ef
NEW Can edit value date of a vat payment after recording it.
...
Conflicts:
htdocs/compta/localtax/card.php
htdocs/core/class/html.form.class.php
2016-03-25 16:01:45 +01:00
Juanjo Menent
aa9a39cab5
NEW #3510 : Standardize module
2016-03-25 15:59:44 +01:00
Laurent Destailleur
e30d717e00
Uniformize look
2016-03-25 15:56:27 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e
Revert change that break compatiblity with 100% of modules
2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Laurent Destailleur
46613cd72b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-25 14:50:00 +01:00
Laurent Destailleur
4ec41bc33b
NEW Can edit value date of a vat payment after recording it.
2016-03-25 14:49:48 +01:00
Laurent Destailleur
bdead30e75
FIX Missing function
2016-03-25 14:42:16 +01:00
BENKE Charlie
54af96b21b
Add : BILL_NEVER_BE_CANCELED
...
In some case we don't want to allow cancel bill, forced to made an avoir
2016-03-24 11:38:05 +01:00
Juanjo Menent
922c57da76
NEW #3510 : Standardize module
2016-03-23 22:45:04 +01:00
Laurent Destailleur
612aa0ab04
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-22 15:50:56 +01:00
Laurent Destailleur
f686ef1d04
Uniformize look
2016-03-22 15:50:35 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3
NEW Converted Form::showLinkedObjectBlock to a static function
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Marcos García de La Fuente
889c72611d
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-03-19 23:00:33 +01:00
Marcos García de La Fuente
59bfac65aa
Little refactor
2016-03-19 20:48:37 +01:00
Marcos García de La Fuente
1be9c53b6c
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-19 19:39:18 +01:00
Laurent Destailleur
ba4f5c8648
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 19:26:57 +01:00
Laurent Destailleur
ee857055be
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34
Fix regression description line not visible
2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-03-19 19:15:23 +01:00
Laurent Destailleur
f0eb8ac794
Fix regression Product ref not visible
2016-03-19 19:13:27 +01:00
Laurent Destailleur
558d03c371
Add the "now" link on date to pay vat
2016-03-18 19:44:40 +01:00
Laurent Destailleur
b4e775dd35
FIX Parsing of amount to pay vat
2016-03-18 19:42:56 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
c5e744bfc2
FIX #4839
2016-03-18 12:16:40 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Laurent Destailleur
08c5fd2e36
FIX #4809 - Duplicate functions with different content
2016-03-14 14:38:30 +01:00
Laurent Destailleur
619ebf9a3e
Enhance css of search fields
2016-03-13 20:38:16 +01:00
Laurent Destailleur
543f5cef63
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
Laurent Destailleur
a5571b1040
NEW Show a badge with number of withdraw requests done on the withdraw
...
tab of invoice.
2016-03-13 01:20:54 +01:00
Laurent Destailleur
f345ff7300
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-13 01:11:42 +01:00
Laurent Destailleur
1b30c1adb4
Fix regression on vat calculation when invoice was not a situation
...
invoice
2016-03-12 20:49:38 +01:00
Laurent Destailleur
e0809fc750
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/compta/facture.php
htdocs/product/document.php
2016-03-12 18:40:50 +01:00
Laurent Destailleur
368b4c621f
Fix phpcs
2016-03-12 18:25:41 +01:00
Laurent Destailleur
dca5e5278b
Merge pull request #4736 from marcosgdf/bankcateg-oop
...
NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
2016-03-12 12:01:32 +01:00
Laurent Destailleur
8cdc80bfb4
Merge pull request #4787 from grandoc/develop
...
[Qal] uniformize code
2016-03-12 11:52:57 +01:00
Laurent Destailleur
7c950be468
Fix Phpcs
2016-03-11 18:04:45 +01:00
Regis Houssin
f87bb1206e
Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines
...
option
2016-03-11 15:42:14 +01:00
Laurent Destailleur
8b16a76936
Avoid duplicate translation
2016-03-11 10:59:28 +01:00
Marcos García de La Fuente
39f915d95d
Reverted use of BankCateg in Bank category listing
2016-03-10 19:52:27 +01:00
philippe grand
b495fdb58e
[Qal] uniformize code
2016-03-10 15:51:31 +01:00
Laurent Destailleur
ecf47109c0
Merge pull request #4739 from marcosgdf/accountline-oop
...
NEW Created AccountLine::insert function and started using it for transaction creation
2016-03-10 13:55:07 +01:00
Laurent Destailleur
79989c2f65
Merge pull request #4741 from marcosgdf/account-oop-properties
...
Fixed wrong Account class property used in bank/card.php
2016-03-10 13:53:17 +01:00
Laurent Destailleur
21bf8824b9
Merge pull request #4738 from marcosgdf/account-libstatut
...
Refactored Account::libStatut and added object typehinting to some functions of Account class
2016-03-10 13:29:02 +01:00
Laurent Destailleur
4fa84c8d8f
Merge pull request #4707 from marcosgdf/misc2
...
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
2016-03-10 13:21:51 +01:00
Laurent Destailleur
5bd5323c93
Finished to move the mergepdftool dedicated page into the generic "mass
...
actions" feature.
2016-03-10 12:11:11 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Marcos García de La Fuente
08d27b7148
Refactored Account::LibStatut function
2016-03-07 11:31:16 +01:00
Marcos García de La Fuente
66f71d16d9
Fixed wrong Account class property used in bank/card.php
2016-03-06 19:59:37 +01:00
Laurent Destailleur
3dbe27030e
FIX If all banks account are reconcilable to off, we must not show nb of
...
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
2016-03-06 12:39:59 +01:00
Marcos García de La Fuente
ed51a42963
NEW Created AccountLine::insert function and started using it for transaction creation
2016-03-05 16:26:30 +01:00
Marcos García de La Fuente
4f569279d6
Refactored Account::libStatut and added object typehinting to some functions of Account class
2016-03-05 16:14:41 +01:00
Marcos García de La Fuente
0fd9518ad0
NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
...
Also replaced spaces with tabs and applied PSR-2 beautifier to the code
2016-03-05 15:51:02 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Marcos García de La Fuente
6184c71181
Corrected comparison of Account::canBeConciliated output
2016-03-05 14:05:00 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
Laurent Destailleur
cbd102fa45
Merge and rename method into camel format
2016-03-04 16:28:38 +01:00
Laurent Destailleur
87093c79f9
Merge pull request #4708 from marcosgdf/account-constants
...
Started using Account TYPE and STATUS constants
2016-03-04 16:23:50 +01:00
Laurent Destailleur
453466f23f
Fix draft invoice must be destroyed once converted into template
2016-03-03 21:14:20 +01:00
Laurent Destailleur
40144eee8d
NEW linked object can show now the recurring invoices with other linked
...
objects.
2016-03-03 13:38:16 +01:00
Laurent Destailleur
3cbeca26e7
NEW When creating a template invoice from a draft invoice, if there is
...
link to contract on draft invoice, link is kept on template invoice.
2016-03-03 13:16:46 +01:00
Laurent Destailleur
d842d05639
Fix bug in date compare
2016-03-03 12:31:29 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
6f5481896b
FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
...
Close #4453
2016-03-02 12:41:24 +01:00
Marcos García de La Fuente
ff83dd9afe
Replaced account type comparisons with TYPE constants
2016-03-02 11:08:57 +01:00
Marcos García de La Fuente
dcde7773a3
Started using Account TYPE and STATUS constants
2016-03-02 11:04:52 +01:00
Marcos García de La Fuente
66313f584b
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
2016-03-02 10:52:54 +01:00
Marcos García de La Fuente
e646f28c0a
Documented properties of Account class
2016-03-01 15:46:06 +01:00
Frédéric FRANCE
10d04e63c1
Update bonprelevement.class.php
2016-02-29 22:59:08 +01:00
Laurent Destailleur
846d78dfba
FIX Edition of delay (nb of days) for payment term "Immediate" was
...
broken.
2016-02-29 15:43:00 +01:00
Laurent Destailleur
21c7aacddb
Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to
...
provide backward compatibility with old behaviour.
2016-02-29 10:29:32 +01:00
Laurent Destailleur
5453f99e2e
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
4cf59d3f9b
Fix if option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must
...
not show unpaid orders.
2016-02-26 19:13:25 +01:00
Laurent Destailleur
23f45c7b7e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/core/lib/pdf.lib.php
2016-02-26 15:45:25 +01:00
fmarcet
30d6aa0b96
FIX: Some filters are lost when paging
2016-02-26 13:14:23 +01:00
Laurent Destailleur
7567336680
FIX #4683
2016-02-26 10:51:06 +01:00
Laurent Destailleur
8927948bef
NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
2016-02-25 16:27:28 +01:00
Laurent Destailleur
773e5e3b0a
Fix: specific contact of object were lost when used to create invoice.
2016-02-25 01:03:37 +01:00
Laurent Destailleur
191394bf88
Fix: specific contact of object were lost when used to create invoice.
2016-02-25 01:02:11 +01:00
phf
fd4cda819c
New add supplier payment
2016-02-21 22:47:52 +01:00
phf
d320aebe82
Fix muticurrency attributs not declared in class PropalLine
...
Fix fetch_lines of FactureFournisseur with multicurrency fields
2016-02-19 22:41:47 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
03c3eb88d0
Merge pull request #4640 from atm-ph/fix_multicurrency_require
...
Fix replace dol_include_once() function by require_once for internal module
2016-02-19 02:50:05 +01:00
Laurent Destailleur
52c82508e4
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/charges/index.php
2016-02-18 23:27:57 +01:00
Laurent Destailleur
6b9d7763fe
Clean code for adding a link to a related object
2016-02-16 22:26:23 +01:00
phf
6d095fce9f
Fix replace dol_include_once() function by require_once for internal module
2016-02-16 20:44:23 +01:00
Laurent Destailleur
9796b1b268
Can select number of records into lists
2016-02-16 17:43:05 +01:00
Laurent Destailleur
9d418bca7f
Merge branch 'new_add_customer_multicurrency_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-16 15:06:39 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
phf
86c8998742
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351
Add fields to link recurring invoice lines with contract origin when it
...
comes from this.
2016-02-15 16:13:33 +01:00
Laurent Destailleur
d715345c82
Debug
2016-02-15 15:07:57 +01:00
Laurent Destailleur
38f7ac29d7
Show vat of lines on template invoices
2016-02-15 14:49:06 +01:00
Laurent Destailleur
23afb80c82
Can remove status recurring or not of template invoice
2016-02-15 14:42:05 +01:00
Laurent Destailleur
f1f5c48337
Uniformize code
2016-02-15 14:27:35 +01:00
Laurent Destailleur
d4c3258385
Fix missing field
...
Fix bad value for default value of next date
2016-02-15 07:36:45 +01:00
aspangaro
d4057c3feb
Fixed: Correct problem of rights beetween tax and salaries module
2016-02-15 06:56:51 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
e1d713738f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-15 01:03:09 +01:00
Laurent Destailleur
632080855b
Merge pull request #4622 from frederic34/patch-10
...
NEW Show link of bank receipt into bank transation list
2016-02-15 01:02:31 +01:00
Laurent Destailleur
c1c8ead49f
Debug multicurrency module
2016-02-15 00:58:51 +01:00
Laurent Destailleur
e8bc88fffe
Merge branch 'new_recurring_invoice' of
...
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:45:39 +01:00
Frédéric FRANCE
5841055d9a
Update releve.php
2016-02-14 22:53:00 +01:00
Frédéric FRANCE
e7a7909b9d
Update rappro.php
2016-02-14 12:16:17 +01:00
phf
4f6289bea0
Fix test if frequency is defined to create or not by the cron
2016-02-12 16:09:50 +01:00
phf
428a7e7042
FIX remove comment, calcul next date for recurring invoice, increment nb_gen_done
2016-02-12 15:55:55 +01:00
phf
c4812abd62
Fix can update fields of facture rec
...
Fix create invoice from facture rec don't get all properties and add fk_account
2016-02-12 12:31:43 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Laurent Destailleur
518080468e
Fix button create template must be visible only if amount is != 0
2016-02-11 10:39:01 +01:00
phf
875e01aeee
New add recurrence fields on create form of invoice model
...
Fix missing fields in database about multicurrency
2016-02-11 09:50:35 +01:00
phf
a0cfe9aad8
New add payment with multicurrency module
2016-02-10 23:16:38 +01:00
Laurent Destailleur
9b41e11a1e
NEW Can select dynamicaly number of lines to show on page
2016-02-10 20:48:18 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
d89daf9cd2
Work to move the merge pdf tool into the mass action combo of lists
2016-02-08 18:04:42 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Laurent Destailleur
81aae30253
NEW Add a checkbox to select/unselect all lines on page that support
...
mass actions (like invoice list page)
2016-02-07 19:55:41 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
efc2eeea83
Uniformize code for filters on payments
2016-02-07 14:41:06 +01:00
Laurent Destailleur
c1a6a2880b
Debug numbering module for customer payment
2016-02-07 14:22:52 +01:00
Laurent Destailleur
8f8c63e9c8
FIX Delete triggers must be before delete (reverse order compared to
...
create)
2016-02-06 12:37:48 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
f4d04b8f26
FIX part of #4227
2016-02-03 02:41:07 +01:00
Laurent Destailleur
6f1ddd3ba4
Fix on ref not correctly initialized.
2016-02-03 02:29:19 +01:00
Laurent Destailleur
c28c8d5d18
Add more info into log
2016-02-02 16:32:47 +01:00
Florian HENRY
72b0f62089
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-01 15:00:09 +01:00
fmarcet
acc9879c7c
FIX: It doesn't check if there is enough stock to update the lines of orders/invoices
2016-02-01 13:05:14 +01:00
Laurent Destailleur
2d0c823ffe
Fix bad transaction level due to code of situation invoices
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179
Fix bad transaction level due to code of situation invoices
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2016-01-31 20:44:09 +01:00
Laurent Destailleur
0e1bb06d01
Fix duplicate set
2016-01-31 20:41:35 +01:00
Laurent Destailleur
6002adb04c
Fix bad transaction level due to code of situation invoices
2016-01-31 20:38:11 +01:00
Florian HENRY
7d374c2b02
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/core/class/link.class.php
2016-01-30 17:32:01 +01:00
Laurent Destailleur
eee0037a5b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-30 14:32:47 +01:00
Laurent Destailleur
c4d8c20abb
Fix missing include
2016-01-30 14:32:20 +01:00
Florian HENRY
36901d5417
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-30 14:21:45 +01:00
Laurent Destailleur
3c63bf7ffa
Merge pull request #4465 from defrance/patch-95
...
if FAC_FORCE_DATE_VALIDATION can't change the billing date
2016-01-30 12:43:52 +01:00
Laurent Destailleur
bb1cad871b
Merge pull request #4478 from frederic34/patch-7
...
Add fk_bordereau in account statements
2016-01-30 12:34:09 +01:00
Laurent Destailleur
11f6cb6f5a
Merge pull request #4479 from frederic34/patch-8
...
Add fk_bordereau in account statement conciliation
2016-01-30 12:31:36 +01:00
Florian HENRY
0582c78131
Add exepnse report into accoutnacy standard report
2016-01-29 14:05:37 +01:00
bobby
b95e9f0097
NEW : Add expense report into accountancy report
2016-01-28 14:26:52 +01:00
phf
4baff7898d
FIX insert FactureLigne
...
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
2016-01-26 22:18:31 +01:00
Maxime Kohlhaas
6313f64c93
Fix : amount in bank line is necessarily in the account currency
2016-01-26 18:09:52 +01:00
phf
83f90e2b1f
Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/commande/card.php
2016-01-25 21:50:43 +01:00
phf
373225272b
FIX reorder the display of currency and rate on propal/order
...
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
2016-01-23 16:01:55 +01:00
Frédéric FRANCE
4ed2831112
Add fk_bordereau in account statement conciliation
2016-01-22 12:23:13 +01:00
Frédéric FRANCE
4d842d91d7
Add fk_bordereau in account statements
2016-01-22 12:20:03 +01:00
Laurent Destailleur
78ee675993
Merge pull request #4463 from frederic34/patch-9
...
Update card.php
2016-01-22 04:13:13 +01:00
Laurent Destailleur
d8cbe39c46
Merge pull request #4461 from frederic34/patch-8
...
total records for payment list
2016-01-22 04:13:02 +01:00
Laurent Destailleur
d7da972ead
Merge pull request #4460 from frederic34/patch-7
...
total records for deposit list
2016-01-22 04:12:49 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
600a4e961b
Merge pull request #4464 from frederic34/patch-10
...
typo
2016-01-22 02:11:01 +01:00
Frédéric FRANCE
b0530539f4
Update rappro.php
2016-01-20 13:59:56 +01:00
Laurent Destailleur
03461d124a
Fix activation of cron jobs by external module
...
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
BENKE Charlie
2036f17df5
if FAC_FORCE_DATE_VALIDATION can't change the billing date
2016-01-19 21:45:44 +01:00
Frédéric FRANCE
0a7de725b0
typo
2016-01-19 19:08:01 +01:00
Frédéric FRANCE
d242d6ec6d
Update card.php
2016-01-19 17:39:21 +01:00
Frédéric FRANCE
b97417f3bf
Update list.php
2016-01-19 12:18:29 +01:00
Frédéric FRANCE
6918a425a0
total records for deposit list
2016-01-19 12:15:37 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
phf
a50a7366cb
FIX travis test
2016-01-13 14:04:48 +01:00
phf
d213fbae08
FIX invoice situation
2016-01-13 13:42:58 +01:00
Laurent Destailleur
1b1bd73e6b
Merge pull request #4404 from frederic34/patch-8
...
FIX When doing payment for money back, bank account was not set by default
2016-01-12 23:20:32 +01:00
Frédéric FRANCE
92885065c6
Update facture.php
2016-01-12 10:09:02 +01:00
aspangaro
cf6be40922
New: #3292 Make sure each and every page displays a title
2016-01-11 22:03:26 +01:00
Raphaël Doursenaud
7281338f8d
FIX #4291 Correctly filter bank card GETPOSTs
2016-01-11 10:51:45 +01:00
Laurent Destailleur
68ef5ef5a8
Merge pull request #4388 from aspangaro/3.9-p5
...
Fix: HRM index - typo and presentation
2016-01-10 18:21:32 +01:00
aspangaro
47f63172e3
Fix: HRM index typo and presentation
2016-01-10 14:58:54 +01:00
Laurent Destailleur
c07cb5a72e
Merge pull request #4371 from frederic34/patch-7
...
Always show remove button and why we can't remove
2016-01-10 11:37:56 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Juanjo Menent
dbd427ea06
Merge pull request #4264 from aspangaro/develop-a6
...
Accountancy Add a list to select accounting account on bank account
2016-01-09 17:42:52 +01:00
Frédéric FRANCE
0c6bd4e617
Update card.php
2016-01-09 10:37:53 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
87c236b534
Fix when error creating invoice from predefined invoice, we must go back
...
to create page from same predefined invoice.
2016-01-08 16:30:43 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
Laurent Destailleur
ed3f0ce86b
Fix totalnboflines not correctly managed
2015-12-28 00:20:48 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
0645938283
FIX #4230 PHP7 error
2015-12-27 18:26:21 +01:00
Marcos García
da959c5cf0
Little typo in commit 8b633ae
2015-12-25 11:32:13 +01:00
Juanjo Menent
c6093fff3e
Merge pull request #4289 from marcosgdf/bug-4285
...
FIX #4285 SQL query shown when accessing an unexisting invoice
2015-12-24 22:00:00 +01:00
Juanjo Menent
b9d0fc5aaf
Merge pull request #4271 from grandoc/develop
...
[Qual] Uniformize code
2015-12-24 15:43:14 +01:00
Marcos García de La Fuente
de1625b9de
FIX #4285 SQL query shown when accessing an unexisting invoice
2015-12-24 14:46:01 +01:00
Marcos García de La Fuente
8b633aee66
FIX #4182 SQL error when deleting an unexisting bank entry
2015-12-24 14:39:28 +01:00
Laurent Destailleur
8c1f271356
Maxi debug of module leave requests.
2015-12-24 12:37:38 +01:00
Laurent Destailleur
559e621fd2
Fix conflict with trigger to delete payment customer and supplier.
2015-12-23 19:54:56 +01:00
philippe grand
1eeee203d7
[Qual] comments should be in english
2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
fec5f4e20b
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:38:23 +01:00
Laurent Destailleur
932c3f9172
Fix init of situation_percent
2015-12-21 12:37:58 +01:00
Laurent Destailleur
a2ae9b9cfc
Fix forget password page must have a different title then login page
...
Fix Missing translations
2015-12-21 00:47:44 +01:00
Laurent Destailleur
3517b64031
FIX #4228 PHP7 error
2015-12-19 18:18:24 +01:00
Laurent Destailleur
ba9796a438
Merge pull request #4082 from atm-maxime/fix_situation_percent
...
Fix : situation percent should be 100 by default
2015-12-19 17:49:04 +01:00
aspangaro
3b0514af6f
Accountancy Add a list to select accounting account on bank account
2015-12-19 07:47:40 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
Laurent Destailleur
5eea1ce7d9
Fix several warnings
2015-12-17 19:37:24 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Bahfir Abbes
e415a3ddf2
Update facture.php
...
fix change customer function in customer invoices - include customers or prospects only
2015-12-14 15:01:29 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 16:09:09 +01:00
philippe grand
30eb08151d
[Qual] Close database handler should be after Footer
2015-12-11 14:19:38 +01:00
Laurent Destailleur
a209d18649
FIX Can use formated float number on old expense report module.
2015-12-06 19:51:28 +01:00
Laurent Destailleur
939a36428c
Merge pull request #4156 from grandoc/develop
...
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
7f3531a04c
Enhance script to track duplicate translation string and use it to
...
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
philippe grand
94fe00fe8d
[Qual] Uniformize code
2015-12-04 19:45:39 +01:00
Laurent Destailleur
a7d03af4af
Fix sending emails from mergepedtool was just doing wrong things.
2015-12-03 12:47:21 +01:00
Laurent Destailleur
055e650adf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0
Work on the "mass action" feature. Can run mass action on
...
result of a select.
2015-12-02 22:00:39 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
88e76dcf64
Fix utf8 encoded twice
2015-11-28 14:40:23 +01:00
Maxime Kohlhaas
da51a28766
Fix : situation percent should be 100 by default
2015-11-23 17:22:29 +01:00
Frédéric FRANCE
3d05b53a62
Typo
2015-11-22 19:08:38 +01:00
Laurent Destailleur
5e0b5cb75d
Merge pull request #4009 from frederic34/patch-7
...
Update list.php
2015-11-21 00:18:29 +01:00
Laurent Destailleur
401b2a7389
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/theme/md/style.css.php
2015-11-20 23:47:07 +01:00
Frédéric FRANCE
c647ad6425
Update list.php
2015-11-18 18:15:02 +01:00
philippe grand
42ed3d2bb7
[Qual] Uniformize code
2015-11-18 16:05:41 +01:00
Laurent Destailleur
fbd1d2360f
Comment
2015-11-18 13:42:38 +01:00
Frédéric FRANCE
0424a2bb3d
Update list.php
2015-11-16 16:27:37 +01:00
philippe grand
f190e5f931
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-16 08:48:07 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
philippe grand
f308606ee1
[Qual] Uniformize code
2015-11-15 07:47:35 +01:00
Laurent Destailleur
192fdbdcc4
Minor look uniformization
2015-11-14 23:10:12 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
eac80d7db4
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
Laurent Destailleur
ea6fe02f18
Merge pull request #3923 from altatof/customerinfos
...
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
2015-11-13 00:35:39 +01:00
Laurent Destailleur
74a4006a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Florian HENRY
019575d9ed
FIX : better fix for #3805
2015-11-12 13:21:35 +01:00
philippe grand
c712532bf6
[Qual] Uniformize code
2015-11-12 11:59:15 +01:00
Christophe Battarel
cc35f2b738
Merge branch 'develop' into customerinfos
2015-11-11 15:46:22 +01:00
Christophe Battarel
0c40a6dda5
add hidden constant
2015-11-11 15:32:42 +01:00
philippe grand
12c5d02a7a
[Qual] Uniformize code
2015-11-11 12:27:09 +01:00
Juanjo Menent
a6f0baefc1
Merge pull request #3933 from marcosgdf/bug-3980
...
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-08 11:15:31 +01:00
Laurent Destailleur
1d2dab63a3
More space
2015-11-08 02:32:22 +01:00
Laurent Destailleur
333dd10874
Add a way to lin on bank receipt tab directly
2015-11-08 02:09:32 +01:00
Laurent Destailleur
7a423c04d4
Fix The only default value is value we just entered
2015-11-08 02:00:28 +01:00
Laurent Destailleur
e350b759d3
Increase number of last bank receits visible links
2015-11-08 00:52:25 +01:00
Laurent Destailleur
b5c9602da4
Fix Use new look for left-right arrow
2015-11-08 00:08:50 +01:00
Laurent Destailleur
031b33d582
FIX Checkbox reconciliated no correctly checked with some Chrome
...
versions
2015-11-07 23:54:11 +01:00
Laurent Destailleur
3906cb79c5
NEW: Add parameter to add a link to use "date of invoice" in one click
...
when fille a payment card.
2015-11-07 23:46:07 +01:00
Marcos García de La Fuente
01854b3259
FIX #3679 Error when deleting a Localtax2 special payment
2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
b4c3804c91
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
2015-11-07 13:21:03 +01:00
Christophe Battarel
f52ae35dc6
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
...
scratch, reload page after customer selection so its informations can be
loaded
2015-11-06 16:14:00 +01:00
Florian HENRY
121d2beb80
fix spacing
2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca
FIX : only active customer should be available into select list
...
thirdparty on invoice creation
2015-11-06 10:19:10 +01:00
Florian HENRY
600dbced7e
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32
FIX : only active customer should be return into new invoice creation
...
select list
2015-11-06 09:49:02 +01:00
Sergio Sanchis Climent
6b01db5960
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent
de8e7107ee
Maintain origin_id and origin for copy document
...
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
04664c203d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Christophe Battarel
80d2445540
FIX: bad stock valorisation
2015-11-05 17:00:22 +01:00
fmarcet
015dedc3ab
FIX: Show category selector if we have permission to view products or
...
services
2015-11-05 11:53:45 +01:00
Laurent Destailleur
1f4481a6b0
Merge pull request #3172 from atm-maxime/new_creditnote
...
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
2015-11-05 02:45:15 +01:00
Raphaël Doursenaud
c534f5bcd5
Fix #3805 Enhanced Facture::is_last_in_cycle()
2015-11-04 20:35:20 +01:00
Laurent Destailleur
a7795f25fc
Fix Must make a difference between a buying/cost price == '' (not
...
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
2015-11-04 17:51:15 +01:00
Laurent Destailleur
563a020595
NEW Free text for cheque deposit receipt can be HTML content.
2015-11-02 20:35:33 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
3ba97627ff
FIX Default thirdparty when cloning invoice was not set.
2015-11-02 15:50:03 +01:00
Laurent Destailleur
200e4638f4
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
...
Fix : #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
aspangaro
d8f77f58d7
Salaries : Replace "label for" by the function fieldLabel & add some notes
2015-11-02 06:42:17 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Maxime Kohlhaas
bd831b1f24
Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote
2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d
FIX The price per level just never correctly manage the vat. Vat is not
...
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
2015-10-25 22:50:05 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
461771d488
Currency is on title only.
2015-10-24 21:20:32 +02:00
Laurent Destailleur
cac4a85ccd
Merge pull request #3788 from atm-maxime/new_customer_recap
...
New customer recap
2015-10-22 18:02:38 +02:00
Maxime Kohlhaas
ef2337a338
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
...
Conflicts:
htdocs/compta/facture/list.php
2015-10-22 14:41:58 +02:00
Frédéric FRANCE
5237a2afc7
Fix lost searchstatus on next page list
2015-10-20 17:45:24 +02:00
Laurent Destailleur
22979523db
Try a fix for #3742
2015-10-20 02:34:53 +02:00
Maxime Kohlhaas
4de7874118
New : review customer account summary and balance
2015-10-19 20:36:25 +02:00
Maxime Kohlhaas
d79fb71987
FIX : search_status not used in mergefusiontool
2015-10-19 16:17:47 +02:00
Maxime Kohlhaas
5fb6705b5c
FIX : Search status not saved into list
2015-10-19 15:53:13 +02:00
Maxime Kohlhaas
9e9f32e3bf
FIX : project was not retrieved on invoice creation form
2015-10-19 15:38:28 +02:00
Laurent Destailleur
81580f75b9
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Laurent Destailleur
bf6b48f5a0
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-10-18 21:17:29 +02:00
Laurent Destailleur
afe4057a97
FIX #3757 Can't set amount in a social contribution with some languages
2015-10-18 21:17:19 +02:00
Laurent Destailleur
be8e7515a1
Merge pull request #3762 from simnandez/3.8
...
Fix: Last page total is 0
2015-10-18 20:27:17 +02:00
Laurent Destailleur
420bfd8301
FIX Preview pages was not using correct style for ref
2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39
FIX The preview of PDF was never refreshed if PDF document was changed
2015-10-18 18:54:54 +02:00
Juanjo Menent
334c14d088
Fix: Last page total is 0
2015-10-18 11:56:42 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
Laurent Destailleur
3ce147ccc1
Use new architecture for quick search for the account area.
2015-10-17 02:41:09 +02:00
Laurent Destailleur
8c66a7d099
Revert a bad PR. if form_confirm is replaced with formconfirm, we must
...
include a print before. It is no more included into function.
2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
d1d6c72d7d
NEW Uniformize way of working for search filters. One filter per object.
2015-10-16 22:21:26 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Gauthier
b3e3cc14a7
FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test.
...
2/ Reindented code
2015-10-15 17:26:16 +02:00
Laurent Destailleur
918d9b7c18
Fix filter was lost if nothing found
2015-10-13 12:05:24 +02:00
Laurent Destailleur
7b7d27920d
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
Frédéric FRANCE
7065b2aa7d
Update account.php
2015-10-10 12:59:58 +02:00
Laurent Destailleur
eeac01b794
Merge pull request #3683 from aspangaro/develop-68
...
New : Add payment donation in accountancy expert & presentation
2015-10-09 20:25:50 +02:00
Laurent Destailleur
a1d37f92cb
Several fix in CSS
2015-10-09 20:00:43 +02:00
Laurent Destailleur
61d739635e
Uniformize code and css for tables. Filters must be implemented
...
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
philippe grand
0e343ae3b2
syntax error
2015-10-08 09:34:02 +02:00
aspangaro
e0f2c41a37
Merge remote-tracking branch 'Upstream/develop' into develop-68
2015-10-07 21:08:00 +02:00
aspangaro
e1f946578b
Fix presentation
2015-10-07 21:06:55 +02:00
Laurent Destailleur
1f742c7464
FIX Add a test to save life when ref of object (invoice ref, order ref,
...
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
2015-10-06 16:38:27 +02:00
Laurent Destailleur
f54a1ca367
CSS enhancement
2015-10-06 01:03:31 +02:00
Laurent Destailleur
e3f225e038
FIX bad link into project box
2015-10-05 19:41:41 +02:00
Laurent Destailleur
68d4a9fc63
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
Laurent Destailleur
c20296f963
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-10-04 20:46:17 +02:00
Laurent Destailleur
39671d5c53
Merge pull request #3653 from frederic34/patch-11
...
Autocomplete with last conciliate number
2015-10-04 20:09:25 +02:00
Laurent Destailleur
f4b26285a2
Merge pull request #3649 from frederic34/patch-18
...
Lost search_status on next page button
2015-10-04 20:02:37 +02:00
frederic34
f2d7523091
Optioncss
2015-10-04 12:31:32 +02:00
frederic34
ed917ab447
Optioncss
2015-10-04 11:30:28 +02:00
Juanjo Menent
5deedcdb6f
Merge pull request #3577 from simnandez/dolibarr-3509
...
Issue #3509 : Ready for customers
2015-10-03 23:58:12 +02:00
Juanjo Menent
31230d296d
Merge remote-tracking branch 'upstream/3.8' into develop
2015-10-03 23:51:38 +02:00
Frédéric FRANCE
c077e69047
Autocomplete with last conciliate number
2015-10-03 20:54:27 +02:00
Laurent Destailleur
00911d1afe
Fix bad param
2015-10-03 19:05:13 +02:00
Laurent Destailleur
474bf611ad
FIX product type must be defined before used for vat calculation.
2015-10-03 18:33:46 +02:00
Juanjo Menent
9d60dee781
Issue #3509 : Ready for customers
2015-10-03 17:15:25 +02:00
Juanjo Menent
03a2fd740d
Issue #3509 : Ready for customers
2015-10-03 16:58:46 +02:00
Juanjo Menent
92f4c0d015
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
2015-10-03 16:01:24 +02:00
Juanjo Menent
553c8c0bd0
Merge pull request #3643 from frederic34/patch-12
...
Typo (broken facture.php)
2015-10-03 15:57:04 +02:00
Juanjo Menent
8da8b66693
Issue #3509 : Init works
2015-10-03 15:53:36 +02:00
Juanjo Menent
67d28d6991
Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Frédéric FRANCE
471e75f029
Lost search_status on next page button
2015-10-03 10:15:07 +02:00
Frédéric FRANCE
8a984980ca
Type (broken facture.php)
2015-10-02 16:16:05 +02:00
philippe grand
e22fb3c538
fix : Typo
2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5
fix : Typo
2015-10-02 12:37:13 +02:00
Regis Houssin
8912e111a3
Fix: wrong date format
2015-10-02 11:21:23 +02:00
Juanjo Menent
cfa6938e5e
Merge pull request #3637 from hregis/develop_origin
...
Fix: sql error, status is an integer
2015-10-02 11:11:39 +02:00
Regis Houssin
65935c6603
Fix: copy/paste error
2015-10-02 10:46:32 +02:00
Regis Houssin
6f9b0e1053
Fix: sql error, status is an integer
2015-10-02 10:37:08 +02:00
Frédéric FRANCE
6e947add92
Update index.php
2015-10-02 08:58:09 +02:00
Laurent Destailleur
4201e8b032
FIX #3630 - Wrong balance report when module salaries and donation
...
disabled
2015-10-01 14:38:31 +02:00
Laurent Destailleur
b57c156b60
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modContrat.class.php
htdocs/fichinter/card.php
htdocs/install/upgrade2.php
2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/lib/security.lib.php
2015-10-01 11:10:47 +02:00
Laurent Destailleur
72c31c0fa9
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-10-01 10:48:28 +02:00
Laurent Destailleur
4da8fb901b
Add comment
2015-10-01 10:48:09 +02:00
arnaud
0b7305d21a
FIX facturestat bad sql when customer view is limited
2015-09-28 16:55:34 +02:00
Laurent Destailleur
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
fa9103fc97
FIX Bad title line in project view when using jmobile
2015-09-27 16:50:47 +02:00
Laurent Destailleur
fef8203e65
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-09-26 12:01:58 +02:00
Laurent Destailleur
a3647bea4e
Fix bad information in report
2015-09-26 11:53:36 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
4fa1be0e35
Issue #3509 : Init works
2015-09-26 10:37:36 +02:00
BENKE Charlie
8dcd6158e3
3.8 bad filtering caused by statut filter #3580
...
correction ported on 3.8 too, sorry for the bad step process
2015-09-26 10:15:42 +02:00
Juanjo Menent
ad1a4c7e15
Merge pull request #3598 from GPCsolutions/formconfirm
...
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
d503dd928b
Merge pull request #3597 from GPCsolutions/displaymargin
...
[Qual] Replaced deprecated displayMarginInfos()
2015-09-26 08:47:55 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Juanjo Menent
93c0adf725
Merge pull request #3583 from GPCsolutions/clone
...
[Qual] Replaced deprecated dol_clone by native clone
2015-09-26 08:33:48 +02:00
Juanjo Menent
7bdb5ec86e
Merge pull request #3580 from defrance/patch-80
...
fix issue #3579 : bad filtering caused by statut filter
2015-09-26 08:31:24 +02:00
Raphaël Doursenaud
485c369d55
[Qual] Replaced deprecated form_confirm()
2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
50edf63448
[Qual] Replaced deprecated displayMarginInfos()
2015-09-24 21:05:58 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
BENKE Charlie
b821878293
change > 0 by >= 0 as mentionned by raphael
2015-09-24 16:53:44 +02:00
BENKE Charlie
d30d91b165
fix issue #3579 : bad filtering caused by statut filter
2015-09-24 08:42:39 +02:00
aspangaro
918c323f8f
Salaries : Add info card / add field datec / rename field user_creat to user_author
2015-09-23 06:37:14 +02:00
aspangaro
74e46b2de3
Salaries : Add label for accessibility
2015-09-23 05:47:49 +02:00
Laurent Destailleur
da6a1d6629
NEW Introduce a method getDefaultCreateValueForField for developers to
...
get a default value to use for a form in create mode.
Implement it for public and private notes.
2015-09-22 13:55:31 +02:00
Laurent Destailleur
0821f18712
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-18 21:50:10 +02:00
Laurent Destailleur
8699776930
Better usability with dolidroid
2015-09-18 16:17:52 +02:00
Laurent Destailleur
e974b07b09
Fix javascript error
2015-09-18 16:05:38 +02:00
Laurent Destailleur
0ef297582b
Merge pull request #3511 from marcosgdf/bug-3423
...
FIX #3423 Not possible update values of extrafields in Facture
2015-09-13 19:07:15 +02:00
Juanjo Menent
3db03ed558
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-12 23:45:16 +02:00
Juanjo Menent
1deb77896f
Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order
2015-09-12 23:42:48 +02:00
Laurent Destailleur
b94fb9e1f3
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-12 18:22:10 +02:00
Laurent Destailleur
67b7345e83
Fix the feature to log a cheque as returned.
...
Fix duplicate parameter mainmenu and leftmenu into url
2015-09-12 18:00:19 +02:00
Marcos García de La Fuente
637855485e
FIX #3423 Not possible update values of extrafields in Facture
...
Close #3423
2015-09-12 17:28:32 +02:00
Laurent Destailleur
94723a9b83
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
aspangaro
15e50ecdb3
Update work
2015-09-09 21:35:41 +02:00
aspangaro
ae6f547ba5
Merge remote-tracking branch 'Upstream/develop' into develop-62
2015-09-09 20:57:28 +02:00
Laurent Destailleur
615734012e
Merge pull request #3476 from marcosgdf/refactor
...
Refactor: Created hasDelay functions
2015-09-09 20:50:58 +02:00
Laurent Destailleur
7fd01d4aa3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
2015-09-09 12:45:22 +02:00
Juanjo Menent
d0c2131b09
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-08 21:32:37 +02:00
Juanjo Menent
7d88405058
Fix #3475 RemiseCheque: Undefined variable $date
2015-09-08 21:31:04 +02:00
Juanjo Menent
c13d2d202b
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2015-09-08 21:08:59 +02:00
Juanjo Menent
355fcc78cf
Fix #3475 RemiseCheque: Undefined variable $date
2015-09-08 20:48:31 +02:00
Marcos García de La Fuente
2f85d02911
Added missing RemiseCheque properties
2015-09-06 19:24:17 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
3c5159f497
Created Facture::hasDelay function
2015-09-05 10:56:13 +02:00
Laurent Destailleur
c03d508bd3
Merge pull request #3467 from guerrierk/develop
...
NEW Adding Document tab into Bank Account
2015-09-05 10:26:51 +02:00
Laurent Destailleur
087938e340
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/bank/class/account.class.php
2015-09-05 10:25:01 +02:00
Laurent Destailleur
6ac4b8d0d4
Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2
2015-09-05 10:22:43 +02:00
Laurent Destailleur
4c0f117e55
Merge pull request #3465 from open-minds/patch-1
...
Fix detailed information of BBAN for Germany
2015-09-05 10:22:12 +02:00
aspangaro
967a5b2a76
Merge remote-tracking branch 'Upstream/develop' into develop-62
2015-09-05 06:18:47 +02:00
aspangaro
f33cd85c04
New: refund VAT
2015-09-05 06:15:27 +02:00
Laurent Destailleur
8bea703363
Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
...
users need. I introduce a hidden option to fix this quickly.
2015-09-04 23:23:39 +02:00
GUERRIER Kevin
2395c1ca11
fix comment in file description
2015-09-04 21:58:09 +02:00
GUERRIER Kevin
a80b4703a9
Bugfix w/ Travis CI
2015-09-04 21:42:14 +02:00
GUERRIER Kevin
692fdbaec4
Adding Document tab into Bank Account
2015-09-04 21:29:16 +02:00
Laurent Destailleur
a66bcf1965
Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
...
users need. I introduce a hidden option to fix this quickly.
2015-09-04 19:42:07 +02:00
Laurent Léonard
11241c51f5
Fix detailed information of BBAN for Belgium
2015-09-04 18:30:54 +02:00
Laurent Léonard
04b3c23692
Fix detailed information of BBAN for Germany
2015-09-04 18:16:43 +02:00
Laurent Destailleur
d19ec89bf1
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
2d5331b8f8
FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice
...
Close #3460
2015-09-03 12:13:03 +02:00
Marcos García de La Fuente
08565d46fe
Merge branch '3.6' into bug-2893
2015-09-03 11:56:43 +02:00
Marcos García de La Fuente
50184babb9
FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
...
Close #2893
2015-09-03 11:55:40 +02:00
Laurent Destailleur
19ac160696
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.z
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmono.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
2015-09-03 10:49:41 +02:00
Laurent Destailleur
d64a87d980
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/index.php
2015-09-03 10:44:40 +02:00
Laurent Destailleur
001f1b4c31
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-03 10:41:44 +02:00
Laurent Destailleur
c024578ca1
Fix bad link and remove a break
2015-09-02 19:41:54 +02:00
Laurent Destailleur
e3af0b90ec
Fix hidden feature to send remind by email
2015-09-02 18:09:29 +02:00
Laurent Destailleur
df3f29ee96
Fix hidden feature to send remind by email
2015-09-02 16:26:56 +02:00
Laurent Destailleur
5ef3c517bc
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-09-02 16:26:09 +02:00
Laurent Destailleur
c4fa4fc931
Fix hidden feature to send remind by email
2015-09-02 16:25:21 +02:00
Raphaël Doursenaud
870882257d
Fix #3448 Pass expected date format
2015-09-01 11:06:44 +02:00
Laurent Destailleur
5fd6c44640
Fix error management
2015-08-31 13:00:24 +02:00
Laurent Destailleur
dfde0314c6
Fix bad permission
2015-08-31 12:34:59 +02:00
Laurent Destailleur
00b9f98c1c
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-31 12:15:20 +02:00
Laurent Destailleur
942723ff8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-31 12:13:35 +02:00
fmarcet
cf38b17e88
FIX: Bad visualization of suppliers name on Incomes-Expenses mode
2015-08-31 09:18:37 +02:00
Laurent Destailleur
3315978fd3
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-30 21:22:28 +02:00
Laurent Destailleur
1e3bc9f822
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/salaries/index.php
htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/geturl.lib.php
htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
Marcos García
e4bddb4a00
NEW Added __PROJECT_NAME__ tag for customer invoice emails
2015-08-30 13:47:02 +02:00
Laurent Destailleur
47ea834516
Fix debug module expense report
2015-08-28 20:11:16 +02:00
Laurent Destailleur
4377a2d013
Fix style and sql error for field fde.ref not found
2015-08-28 18:20:51 +02:00
Laurent Destailleur
39cbd7629f
Fix error message during import
2015-08-27 23:49:25 +02:00
Laurent Destailleur
aec3976741
Fix set ref
2015-08-27 22:48:52 +02:00
Laurent Destailleur
302b61c5ce
Fix Can't download generated document for cheque summary deposit.
2015-08-27 22:43:09 +02:00
aspangaro
aff134ab65
Fix #3289 Salaries module shows amounts with currency symbol unlike the rest of Dolibarr
2015-08-27 16:10:02 +02:00
Raphaël Doursenaud
33ea968b5b
Fix #3218 Bank date selectors presentation
2015-08-26 19:45:32 +02:00
Laurent Destailleur
8061ec9084
Fix translation
2015-08-24 15:59:17 +02:00
Laurent Destailleur
aaba18bd51
Fix filter on date
2015-08-24 15:40:33 +02:00
Juanjo Menent
7befa78223
Merge pull request #3386 from grandoc/grandoc_fixes_20150815
...
the form should be outside table to avoid errors
2015-08-18 20:07:38 +02:00
Juanjo Menent
8ba1d1d414
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-18 19:59:03 +02:00
Laurent Destailleur
241bf85da2
Fix parameter sendmassremind
2015-08-18 09:53:04 +02:00
philippe grand
0432254412
the form should be outside table to avoid errors
2015-08-15 15:53:07 +02:00
philippe grand
b619aa080d
the form should be outside table to avoid errors
2015-08-15 15:47:17 +02:00
Florian HENRY
a916b75ad8
FIX : Better const usage in accountancy module
2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4
Fix TYPE_SITUATION on sell journals
2015-08-13 11:23:27 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
4b51fc80a6
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2015-08-13 00:06:27 +02:00
Laurent Destailleur
b5730a24bc
Fix W3C
2015-08-12 22:28:30 +02:00
Juanjo Menent
9374b4f3e3
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-08-10 12:14:18 +02:00
Marcos García de La Fuente
7cb564586e
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
...
Close #3310
2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
a24f29ba8b
Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php
...
Close #3341
2015-08-09 13:37:05 +02:00
Maxime Kohlhaas
0afd27e3c2
New : % of evolution on stats
2015-08-07 13:29:11 +02:00
Juanjo Menent
05b0a9b675
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Juanjo Menent
2a67bd1f38
Fix #3314 Display state in bank account card
2015-08-01 14:43:04 +02:00
Laurent Destailleur
13dee1876a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
Raphaël Doursenaud
3b9c8a685b
Fix #3314 Display state in bank account card
2015-07-29 19:29:18 +02:00
Laurent Destailleur
5ca6593a57
Fix serious deadlock feature. It was possible to link with no way to
...
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Marcos García de La Fuente
038f171d6c
Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries
...
Close #3074
2015-07-20 12:18:30 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
2015-07-19 11:38:44 +02:00
Marcos García de La Fuente
d0b1652efd
Merge branch '3.5' into bug-3206
...
Conflicts:
ChangeLog
2015-07-19 11:16:10 +02:00
Marcos García de La Fuente
4649cf7210
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
...
Close #3206
2015-07-18 19:40:48 +02:00
Marcos García de La Fuente
7185cfeb84
Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names
2015-07-18 14:48:59 +02:00
aspangaro
b9b6abd7a8
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-18 05:29:57 +02:00
aspangaro
e8d99323d4
Fix : #3242 [Dashboard] Checks waiting for deposit bad main menu
2015-07-17 05:39:08 +02:00
aspangaro
efbaeaab5c
Fix: Show vat_by_thirdparty when module accounting is on
2015-07-15 23:24:28 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
aspangaro
26ae9a6eb7
Fix: Donation payment type don't show in card
2015-07-15 19:54:51 +02:00
aspangaro
05dcb0d1ac
Correct icon bank
2015-07-15 19:14:30 +02:00
aspangaro
4a899cd856
Typo
2015-07-15 19:13:23 +02:00
Maxime Kohlhaas
20bdfdb286
Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal
2015-07-14 11:57:47 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
Maxime Kohlhaas
9f9ba12802
New : option to allow credit note without related invoice
2015-07-08 14:32:57 +02:00
Maxime Kohlhaas
dc0a1b7fd5
New : add shortcut to create a credit note from the concerned bill
2015-07-08 14:01:30 +02:00
aspangaro
54d2a96d8e
dir DOL_URL_ROOT
2015-07-05 05:56:45 +02:00
Laurent Destailleur
251fedad48
NEW Can edit email template using WYSIWYG editor
2015-07-04 11:57:55 +02:00
Laurent Destailleur
45d27ae250
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 10:50:57 +02:00
Laurent Destailleur
e9b6a6a61e
NEW Add filter on status on invoice list
2015-07-04 10:50:41 +02:00
Laurent Destailleur
56560d9379
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 10:49:01 +02:00
Laurent Destailleur
b7715635a0
Merge pull request #3139 from aspangaro/develop-patch50
...
Disable button add a line in bank module when accountancy module is activated
2015-07-04 04:42:37 +02:00
Laurent Destailleur
9321272838
Uniformize code
2015-07-04 04:34:14 +02:00
Laurent Destailleur
3520c94641
Merge pull request #3131 from atm-maxime/check_rejection
...
New : Check rejection management
2015-07-04 04:20:58 +02:00
Laurent Destailleur
47f9184382
Merge pull request #3114 from aspangaro/develop-patch46
...
Forms are using the tab look, even in creation mode
2015-07-04 04:13:21 +02:00
Laurent Destailleur
bddee5d01f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 04:11:30 +02:00
Laurent Destailleur
5fafb08f91
Uniformize code
2015-07-04 04:11:16 +02:00
Laurent Destailleur
19158979ac
Merge pull request #3122 from ywarnier/tva2
...
Updates and additions to VAT reports
2015-07-04 04:05:04 +02:00
Laurent Destailleur
a49c9c299e
Merge pull request #3102 from aspangaro/develop-patch42
...
HRM area : Show Ref instead of id for expense report
2015-07-04 03:40:13 +02:00
Laurent Destailleur
9c80735310
An easier to use dictionary page to edit email template.
...
Uniformize look.
2015-07-04 03:28:52 +02:00
aspangaro
4627e72f59
Debug && PSR2
2015-07-04 00:01:40 +02:00
Maxime Kohlhaas
5d14d05ce1
Fix : Social contribution payment deletion was not deleting the bank line
2015-07-03 16:38:54 +02:00
aspangaro
111e44493a
Disable button add a line in bank module when accountancy module is activated
2015-07-03 06:48:49 +02:00
Laurent Destailleur
196a745086
NEW Can filter proposal, orders or invoices with criteria "contain at
...
least one product with following tag"
2015-07-02 22:07:13 +02:00
Maxime Kohlhaas
84be022ee1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection
...
Conflicts:
htdocs/compta/paiement/cheque/card.php
2015-07-02 13:45:32 +02:00
Yannick Warnier
3a8c93522f
Convert " " to \t to match custom coding conventions
2015-06-30 15:53:58 -05:00
Yannick Warnier
c9e3cf9fa9
Introduce checkbox for extended customers VAT report
2015-06-30 15:50:35 -05:00
Yannick Warnier
066a7acbaa
Minor - Improve PSR-2 support
2015-06-30 15:42:55 -05:00
Yannick Warnier
6cb69cdaba
Minor - Fix date column title
2015-06-30 15:42:08 -05:00
Yannick Warnier
f0db9a3c3b
Add non-local and local-only VAT customers reports to new quarterly report
2015-06-30 15:41:56 -05:00
Yannick Warnier
c3bb76340f
Improve extended quaterly VAT report
2015-06-30 15:41:00 -05:00
Yannick Warnier
0cfd513b8c
Add extended quaterly VAT report with additional information on dates and customers/suppliers
2015-06-30 15:39:15 -05:00
Yannick Warnier
8e974d024b
Fix broken old queries in VAT's quadri.php
2015-06-30 15:37:22 -05:00
Laurent Destailleur
c69a9996f1
Uniformize code
2015-06-30 15:12:15 +02:00
Laurent Destailleur
a29ca43943
Prepare merge of merge tools and invoice list
2015-06-30 14:32:17 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
aspangaro
46407c1c22
Forms are using the tab look, even in creation mode
2015-06-29 21:58:38 +02:00
aspangaro
768042513d
Merge remote-tracking branch 'Upstream/develop' into develop-42
2015-06-29 06:45:24 +02:00
aspangaro
cff82a5226
Use ref instead of rowid for expense report
2015-06-29 06:41:24 +02:00
Laurent Destailleur
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
Laurent Destailleur
be92f5e7a0
Fix syntax error
2015-06-27 02:31:26 +02:00
Maxime Kohlhaas
16ef029a80
Add function to manage check rejection
2015-06-26 18:50:31 +02:00
Maxime Kohlhaas
f02ba45035
Allow to fetch a payment by its associated bank line id
2015-06-26 17:29:54 +02:00
aspangaro
f9831f908e
Use print_liste_field_titre();
2015-06-26 06:49:43 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
aspangaro
cd282568e8
Merge remote-tracking branch 'Upstream/develop' into develop-42
2015-06-26 05:39:05 +02:00
aspangaro
cb36a919b5
HRM area : Show Ref instead of id for expense report
2015-06-26 05:34:12 +02:00
aspangaro
452733263d
Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT
2015-06-25 06:37:26 +02:00
Juanjo Menent
fc9d54fdaa
Merge pull request #3088 from atm-maxime/develop
...
New : add stats by qty on report turnover by product (+ clean code)
2015-06-24 18:23:31 +02:00
Laurent Destailleur
bdba8f1f38
Fix courrent outstanding amount not visible
2015-06-23 23:33:25 +02:00
Maxime Kohlhaas
5e9c85c789
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-06-23 20:03:46 +02:00
Laurent Destailleur
040a643ee9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3
Time spent
2015-06-23 10:13:08 +02:00
Maxime Kohlhaas
fdf1d953a9
New : add stats by qty on report turnover by product (+ clean code)
2015-06-22 19:22:13 +02:00
Laurent Destailleur
7d1d1caf30
Debug withdraw module
2015-06-21 17:09:00 +02:00
Laurent Destailleur
230fd7a7e4
Debug withdraw module
2015-06-21 17:05:49 +02:00
Laurent Destailleur
8710065ca0
Merge pull request #3072 from atm-maximep/new_set_amount_for_withdraws
...
NEW : Set amount for withdraws requests
2015-06-21 11:52:23 +02:00
Laurent Destailleur
4f1538f502
Introduce table llx_c_holiday_type
2015-06-21 03:19:15 +02:00
Laurent Destailleur
825369230f
Finishment of look
2015-06-20 23:33:13 +02:00
Laurent Destailleur
bbce287892
Fix: Pdf merge tool must see only pdf files
2015-06-19 16:05:04 +02:00
maxime peyrot
f99a127a57
NEW : Enter amount for withdraws requests
2015-06-19 13:45:14 +02:00
aspangaro
d92eab49de
Add the payment in bank module
2015-06-16 05:47:24 +02:00
jfefe
745f0f7d7e
Fix crlf
2015-06-15 14:24:24 +02:00
Laurent Destailleur
87e07a3038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Regis Houssin
b96ed08260
Fix: select date problem with mobile device ( #3039 )
2015-06-14 12:46:27 +02:00
Juanjo Menent
5edfef2525
Merge pull request #3006 from hregis/develop_productprice
...
Fix: disable hook calling
2015-06-12 21:38:14 +02:00
Juanjo Menent
0596be1656
Merge pull request #3008 from hregis/develop_strict
...
Fix: ereg more simple
2015-06-12 21:24:13 +02:00
Marcos García de La Fuente
200eb7b1bb
FIX Close bug #2855 Wrong translation key in localtax report page
2015-06-12 16:27:17 +02:00
fmarcet
42b04102ba
New: Add due date filter on invoices lists
2015-06-11 12:40:16 +02:00
Regis Houssin
e3d1614004
Fix: ereg more simple
2015-06-11 09:21:44 +02:00
Regis Houssin
3fd7c26cf1
Fix: disable hook calling
2015-06-11 07:52:58 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Laurent Destailleur
f7eaf35d30
NEW When creating order, proposal or invoice from thirdparty card, the
...
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
2015-06-03 11:55:39 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Laurent Destailleur
03c06b3cf8
Merge pull request #2916 from aspangaro/develop-patch23
...
FIX: export salaries & NEW: Add tab document on salaries payment
2015-05-30 15:09:23 +02:00
Laurent Destailleur
f5ec2c0605
Merge pull request #2911 from aspangaro/develop-md
...
NEW Forms are using the tab look, even in creation mode
2015-05-30 15:01:26 +02:00
Laurent Destailleur
07ae39fc38
Merge pull request #2910 from aspangaro/develop-patch21
...
Fix: wrong link
2015-05-30 15:00:30 +02:00
phf
9f52b9e800
FIX : #2901
2015-05-29 17:27:05 +02:00
Laurent Destailleur
65c7ab7a93
Fix: Introduce error by default when function is used as a true delete
...
function.
2015-05-29 17:11:42 +02:00
aspangaro
0bd07b795f
NEW: Add tab document on salaries payment
2015-05-28 07:33:50 +02:00
aspangaro
432cf998fa
Fiche-rec: Forms are using the tab look, even in creation & add cancel button
2015-05-28 05:25:29 +02:00
aspangaro
8eee0bdf73
NEW Forms are using the tab look, even in creation mode
2015-05-27 07:41:25 +02:00
aspangaro
5f5388a52a
Fix: wrong link
2015-05-27 07:19:10 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
dcc197eb6b
Fix bug debian 786479
2015-05-22 17:13:32 +02:00
Laurent Destailleur
2f5d1f5965
Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal
...
Fix email cc in selectlist on propal/bill
2015-05-22 16:56:53 +02:00
Laurent Destailleur
4de46892d1
Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro
...
FIX button create payment hide if tax amount is less than 1
2015-05-22 16:53:49 +02:00
Maxime Kohlhaas
ff6708840d
Fix : facturestats was not filtering on invoice type
2015-05-22 09:23:28 +02:00
Alexis Algoud
81a919e8a3
round to price2num
2015-05-22 09:05:38 +02:00
Laurent Destailleur
fb923c0c2b
Merge pull request #2867 from aspangaro/develop-resource
...
NEW Forms are using the tab look, even in creation mode
2015-05-21 21:33:42 +02:00
Laurent Destailleur
a09563435b
Merge pull request #2840 from FHenry/develop
...
NEW : add date value filter on account records list
2015-05-21 21:22:31 +02:00
Alexis Algoud
9184b08f94
FIX button create payment hide if tax amount is less than 1
2015-05-21 16:51:21 +02:00
aspangaro
e23459d53b
NEW Forms are using the tab look, even in creation mode
2015-05-20 21:50:38 +02:00
Florian HENRY
0331ddc2de
fix spacing
2015-05-20 11:30:27 +02:00
Florian HENRY
df4ee9562f
fix spell
2015-05-20 11:29:35 +02:00
Florian HENRY
8fa3b8dac3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-20 11:24:49 +02:00
Florian HENRY
6e6b66e416
apply recommandation from
...
ca53d3b602 (commitcomment-11245627)
2015-05-20 11:24:23 +02:00
aspangaro
58e942681d
NEW Forms are using the tab look, even in creation mode
2015-05-20 07:03:17 +02:00
Francis Appels
40ef5737fc
Fix: SQL error in facturestats on no view rights
...
table alias sc must be available when user has no rights to view
customers. see where defenition line 80
2015-05-19 16:34:21 +02:00
Florian HENRY
ee1aa3268c
working account
2015-05-19 11:55:45 +02:00
Laurent Destailleur
03acb1a8c9
Uniformize way to report error after "buildoc" action.
2015-05-19 00:01:30 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Alexis Algoud
a4031a3680
if contact in sellist, it's an Id
2015-05-18 18:33:17 +02:00
Florian HENRY
a6c5a247cd
add total and title in page records banck account
2015-05-18 11:08:27 +02:00
Florian HENRY
ca53d3b602
NEW : add date value filter on account records list
2015-05-18 10:43:54 +02:00
Laurent Destailleur
c89c883d7d
Fix the new navigation style.
2015-05-17 19:37:37 +02:00
Laurent Destailleur
1b03e348d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/bank/annuel.php
2015-05-16 02:53:36 +02:00
Laurent Destailleur
e382999b9e
Css fix
2015-05-15 20:10:17 +02:00
Laurent Destailleur
976211b70f
Look enhancement
2015-05-15 12:53:14 +02:00
Laurent Destailleur
c33cbefad2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 11:16:29 +02:00
Laurent Destailleur
3e94cc07d2
Fight against valign="top". Minor css fixes.
2015-05-14 16:47:15 +02:00
Alexis Algoud
3dc5ffa871
FIX send mail, copy sendto don't read the list of contact
2015-05-13 18:05:26 +02:00
Laurent Destailleur
5937cd7f70
NEW Forms are using the tab look, even in creation mode.
2015-05-13 17:53:25 +02:00
Laurent Destailleur
43b5209192
NEW Clean code into salary module, debug and add indexes
...
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
4408648a68
Merge pull request #2817 from GPCsolutions/jqueryfixes
...
jQuery fixes
2015-05-12 22:36:12 +02:00
Laurent Destailleur
b3c9c3d91b
Merge pull request #2818 from GPCsolutions/htmlfixes
...
HTML fixes
2015-05-12 22:34:35 +02:00
Laurent Destailleur
cb6f23d9b6
Merge pull request #2771 from aternatik/api_rest
...
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
932e23ac09
[Qual] Use jQuery 'is' instead of 'prop' in conditions
2015-05-12 16:21:21 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
0d8641a073
[Qual] Use jQuery property instead of attribute to test and set checked
2015-05-12 14:51:30 +02:00
Juanjo Menent
97ad7ca88b
Code fixes
2015-05-09 14:23:26 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
971e23e006
Fix special_code was lost when updating line
2015-05-07 12:10:27 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
jfefe
dbb9449ee7
Fix PHPCS
2015-05-06 00:55:42 +02:00
jfefe
5f62d2b13e
Add API class for invoice
2015-05-05 12:42:57 +02:00
Laurent Destailleur
c485b1fe30
Fix When generation of doc is required and generator not provided, we
...
take first entry found.
2015-05-03 20:07:16 +02:00
Laurent Destailleur
4e04f75c66
Fix css
2015-04-27 02:33:44 +02:00
aspangaro
3ae8428a12
New: Add search field for value date in vat payment list
2015-04-23 07:26:09 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
aspangaro
b35c929cad
Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp
2015-04-22 07:18:52 +02:00
aspangaro
560150fd1c
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
2015-04-22 07:15:17 +02:00
Juanjo Menent
b9b21bce8a
Merge pull request #2679 from marcosgdf/bug-1786-2
...
FIX [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
2015-04-21 18:52:56 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Laurent Destailleur
e476b57795
Merge pull request #2678 from defrance69/patch-60
...
add tab management on salarie payement
2015-04-21 11:15:20 +02:00
Laurent Destailleur
9d1c609c4f
Merge pull request #2538 from marcosgdf/units
...
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-04-21 11:14:50 +02:00
Laurent Destailleur
94589b9935
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55
Uniformize feature between invoice and merging tool
2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
28b89a2dec
Fix [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
2015-04-19 18:58:56 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
BENKE Charlie
51cb680f19
Create info.php
...
add info tabs
2015-04-19 13:32:59 +02:00
BENKE Charlie
a151defc4b
Add tabs management
2015-04-19 13:28:51 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Maxime Kohlhaas
54a68116e4
Fix : prevelement with SEPA
2015-04-19 01:55:35 +02:00
Marcos García de La Fuente
270bca740c
Merge branch 'develop' into units
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2015-04-19 00:59:04 +02:00
Laurent Destailleur
4b84e191a6
Use popup for confirm
2015-04-19 00:49:55 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
jfefe
23e5bc4f53
Add title image for bank section
2015-04-18 23:17:47 +02:00
jfefe
22c3406498
Change title images for accountancy section
2015-04-18 23:17:47 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Florian HENRY
f2018b7946
fix bug #2652
2015-04-18 22:59:20 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac
Merge branch 'develop' into fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
9b69b64626
Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583
...
Conflicts:
ChangeLog
2015-04-18 20:10:06 +02:00
Maxime Kohlhaas
53469c803a
Typo
2015-04-18 19:08:01 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Maxime Kohlhaas
e0af2feced
Fix : on impayees remain to pay did not include deposits
2015-04-18 18:06:02 +02:00
Florian HENRY
b7191a541c
All send email card works with model choice box
2015-04-18 17:15:36 +02:00
Laurent Destailleur
246c8a01a6
Merge pull request #2611 from defrance69/patch-58
...
Update paiement.class.php
2015-04-18 15:05:16 +02:00
Juanjo Menent
2f8ed32f76
Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated
2015-04-18 14:17:00 +02:00
BENKE Charlie
6eb17a79da
Update paiement.class.php
...
standardisation of the call of fetch by adding the $ref even they not realy used
2015-04-15 11:40:12 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Marcos García de La Fuente
8f0c41dbd2
Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
2015-04-12 22:02:25 +02:00
Marcos García de La Fuente
6173706531
Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
2015-04-12 21:55:20 +02:00
Marcos García de La Fuente
728b64e334
Fix Bug #2583 : Unable to create a bank transfer with localized numbers
2015-04-12 20:24:22 +02:00
Laurent Destailleur
8ebad7a395
A serious rewrite of a lot of code to have the module batch number
...
stable.
2015-04-12 17:08:14 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
503a4ff7a0
Enhance filtering for bank transaction and timesheet.
2015-04-09 20:40:49 +02:00
Laurent Destailleur
ca7a7a9038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/product/stock/product.php
2015-04-08 20:43:51 +02:00
Laurent Destailleur
edd104a6bc
Merge pull request #2563 from frederic34/patch-7
...
Accounts "from" & "to" need to have same currency
2015-04-08 11:51:41 +02:00
Frédéric FRANCE
7f62892609
Display total with currency code
2015-04-08 09:19:41 +02:00
Frédéric FRANCE
856238c876
Accounts "from" & "to" need to have same currency
2015-04-08 09:09:11 +02:00
Laurent Destailleur
bb83eb0f68
Merge pull request #2561 from frederic34/patch-5
...
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 23:50:17 +02:00
Juanjo Menent
c2bc2c9ea6
Solves #2542 Bug: Contracts store localtax preferences
...
Conflicts:
htdocs/compta/facture.php
2015-04-07 20:10:27 +02:00
Juanjo Menent
1ab70a7086
Solves #2542 Bug: Contracts store localtax preferences
...
Conflicts:
htdocs/compta/facture.php
2015-04-07 20:05:56 +02:00
Juanjo Menent
35a6ed90a0
Solves #2542 Bug: Contracts store localtax preferences
2015-04-07 20:02:12 +02:00
Frédéric FRANCE
06c749942a
Update index.php
2015-04-07 18:40:19 +02:00
Frédéric FRANCE
7a2942684c
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 12:45:25 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
Laurent Destailleur
2550c6b0af
Must exclude draft and abandon into default filter.
2015-04-06 19:22:58 +02:00
Laurent Destailleur
877e60c76f
Set default filter
2015-04-06 19:20:11 +02:00
Laurent Destailleur
02e8879d3b
NEW Feature to build a merged pdf with all unpaid invoice can work for
...
paid invoices.
2015-04-06 19:11:31 +02:00
Scrutinizer Auto-Fixer
4da737424e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Marcos García de La Fuente
40860a84d1
Closes #2543 : Untranslated "Contract" origin string when creating an invoice from a contract
2015-04-04 17:28:24 +02:00
Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
c9f690904c
Merge pull request #2514 from frederic34/patch-10
...
Correction for workboard in compta/bank/index.php
2015-04-02 11:40:55 +02:00
aspangaro
309b059089
New: Add a button to purge criteria in bank lines list
2015-03-31 21:00:22 +02:00
Frédéric FRANCE
fc5d7e57a2
Correction for workboard in compta/bank/index.php
2015-03-31 18:31:36 +02:00
Laurent Destailleur
2bdca3d76b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-31 11:33:10 +02:00
Laurent Destailleur
2d50cc92b9
Differentiate title for customer and supplier orders/invoices.
2015-03-31 11:32:47 +02:00
Laurent Destailleur
86603b01dd
Merge pull request #2504 from marcosgdf/constants
...
Implemented constants for some object types and statuses
2015-03-30 09:25:18 +02:00
Laurent Destailleur
b83e9ea32f
Merge branch 'loan' of https://github.com/frederic34/dolibarr into
...
frederic34-loan
Conflicts:
htdocs/compta/bank/ligne.php
2015-03-30 02:56:26 +02:00
Marcos García de La Fuente
cc1d298f29
Merge branch 'develop' into constants
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
2015-03-30 02:36:46 +02:00
aspangaro
c22a563422
New: Add management for accounting account in admin donation & correct bugs
2015-03-29 21:04:20 +02:00
frederic34
b6b1617741
Work on payment loan
2015-03-29 17:53:36 +02:00
Laurent Destailleur
73b2e0bd01
Merge pull request #2471 from marcosgdf/refactor
...
refactor
2015-03-29 16:17:36 +02:00
Laurent Destailleur
661961876a
Merge pull request #2485 from aspangaro/develop-patch2
...
Fix: Missing language key
2015-03-29 15:05:37 +02:00
aspangaro
ce6df7c022
Debug
2015-03-29 09:20:32 +02:00
aspangaro
9d25a1c7ed
Fix: Missing language key
2015-03-27 06:59:21 +01:00
aspangaro
77b123cb2d
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-27 06:30:35 +01:00
aspangaro
a39f81b1a6
FIXED: Correct path of loan class
2015-03-26 20:51:27 +01:00
aspangaro
b60f1e33d6
Debug
2015-03-26 06:29:16 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
9d34b40897
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
Marcos García de La Fuente
3d50b41b8e
Reverted $rowid instead of $id property
2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
aspangaro
ad0f1aae6b
Move loan in htdocs
2015-03-22 20:19:22 +01:00
aspangaro
414d4c6432
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-22 18:08:12 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
aspangaro
b4b3c45dbc
Update works
2015-03-21 18:00:16 +01:00
aspangaro
c4a580723d
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-20 06:36:06 +01:00
aspangaro
fa41132372
Move module Don in htdocs->donations
2015-03-19 05:22:42 +01:00
aspangaro
4e68586389
Move module Dons in htdocs>donations
2015-03-19 05:08:23 +01:00
aspangaro
dbeccf7653
Update work
2015-03-18 21:56:00 +01:00
Laurent Destailleur
6ceda02eaa
NEW: Enhancement of module 'Notification by Email'. Show nb of
...
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Laurent Destailleur
cd2fc2f890
Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook
...
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
2015-03-18 14:31:37 +01:00
aspangaro
e6d9d18f25
Update work on donation
2015-03-18 06:29:10 +01:00
aspangaro
4e83952485
Add payment on donation
2015-03-18 05:07:32 +01:00
Laurent Destailleur
6e251690ab
Doxygen
2015-03-17 11:23:45 +01:00
aspangaro
03bf12bdc0
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-16 06:32:11 +01:00
aspangaro
1cd81f0e81
Work on module donations
2015-03-16 06:29:15 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
2015-03-15 18:07:30 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Marcos García de La Fuente
094538c07b
Implemented constants in Commande, Facture and Propal
2015-03-15 11:48:57 +01:00
Laurent Destailleur
c45ec24958
Merge pull request #2379 from atm-maxime/develop
...
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
2015-03-14 14:08:38 +01:00
Juanjo Menent
a2adeb2807
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
...
159
2015-03-14 10:17:41 +01:00
Juanjo Menent
851cae80a2
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
...
159
2015-03-14 10:16:50 +01:00
Maxime Kohlhaas
3578ca8baa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-11 08:52:09 +01:00
aspangaro
3897e65425
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-11 05:28:59 +01:00
Laurent Destailleur
a5645b626c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
2015-03-11 03:29:52 +01:00
Laurent Destailleur
e8732df747
Merge pull request #2441 from aspangaro/develop-ReviewER
...
FIXED: Review Expense Report
2015-03-11 02:14:13 +01:00
Maxime Kohlhaas
05a2a6af00
FIX : [bug #1900 ] Unable to remove a salary with enough permissions
2015-03-10 15:53:02 +01:00
Maxime Kohlhaas
6f9fb6a282
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-10 15:18:08 +01:00
Maxime Kohlhaas
f90df57dc5
New : disallow social contribution modification if paid
2015-03-10 14:49:36 +01:00
Maxime Kohlhaas
db4bbf46fc
New : allow to edit social contribution amount
2015-03-10 14:43:13 +01:00
Laurent Destailleur
209f8946d0
All files must be lowercase
2015-03-10 14:17:58 +01:00
Laurent Destailleur
d847f9581e
Fix generation of RUM number. Show it on card to help debug.
2015-03-10 11:31:23 +01:00
Laurent Destailleur
2ea3eb3505
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-10 10:12:08 +01:00
Laurent Destailleur
dc30092290
Add column to store salary ref when doing payment.
2015-03-10 10:11:51 +01:00
Laurent Destailleur
90abe5cdf9
NEW: Add current salary on list of payment
2015-03-10 09:29:24 +01:00
aspangaro
f3258d59c6
Uniformize status & add price()
2015-03-08 07:21:07 +01:00
Laurent Destailleur
3894a48ffd
Fix: bad CSS
2015-03-08 02:37:25 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
aspangaro
8c6a50554e
Debug of Frederic34. Thanks !
2015-03-05 20:37:36 +01:00
aspangaro
11704e0807
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-05 20:24:53 +01:00
Laurent Destailleur
7b7b5090c7
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
...
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 23:03:29 +01:00
Laurent Destailleur
8e29dcdb79
Some fix after merging bank account number form
2015-03-04 21:59:03 +01:00
Laurent Destailleur
40adbe5a72
Merge pull request #2420 from aspangaro/develop-patch17
...
NEW: [T1848] Merge bank card & account card
2015-03-04 21:09:28 +01:00
Marcos García de La Fuente
4c08d34bb5
Standardized $rowid as property
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
ad72425291
Moved some variables from FactureLigne to CommonInvoiceLine
2015-03-04 10:37:43 +01:00
Laurent Destailleur
fa2e57eaa3
pcpcs
2015-03-04 01:10:23 +01:00
aspangaro
022d051726
Typo
2015-03-03 06:32:46 +01:00
aspangaro
42e43791ef
Add ajax for type on edit mode
2015-03-03 06:20:09 +01:00
aspangaro
fafebf5b2a
NEW: [T1758] Merge bank card & account card
2015-03-02 22:44:11 +01:00
aspangaro
c119ce382e
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-02 21:05:38 +01:00
Laurent Destailleur
73afe1513d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Laurent Destailleur
3475433eaf
Fix: the bank information were visible into pdf but were not using
...
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Laurent Destailleur
9b2a90b468
Fix: all home area pages has the search box first.
2015-03-02 00:43:17 +01:00
Laurent Destailleur
ef89ff6601
Merge pull request #2402 from aspangaro/develop-patch14
...
NEW: Add a search field and report on hrm area
2015-03-02 00:41:43 +01:00
Laurent Destailleur
f81cb81e67
Merge pull request #2405 from frederic34/patch-5
...
phpcs
2015-03-02 00:31:50 +01:00
Laurent Destailleur
2795d27cc9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
htdocs/projet/index.php
2015-03-01 16:13:22 +01:00
Laurent Destailleur
9b0dce2e34
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/lib/agenda.lib.php
2015-03-01 13:58:56 +01:00
Laurent Destailleur
a421564b84
Fix phpcs
2015-03-01 13:52:58 +01:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Laurent Destailleur
b888a04af9
Reduce a lot of duplicate code. Move all tables of extrafields setup
...
into a tpl file.
2015-02-28 20:14:26 +01:00
Laurent Destailleur
804058c25e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-28 18:10:54 +01:00
Frédéric FRANCE
eb2cc110fc
phpcs
2015-02-28 10:49:14 +01:00
aspangaro
78af862c19
NEW: Add a search field and report on hrm area
2015-02-28 08:46:40 +01:00
Laurent Destailleur
8e26c71fa7
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Juanjo Menent
856c8f24de
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:14:45 +01:00
Juanjo Menent
88d1d203d8
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:13:24 +01:00
Juanjo Menent
7ca8fdb20c
PHP norms
2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47
Fix: Bad SEPA xml file creation
2015-02-27 17:55:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
fe7889e266
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
aspangaro
4803a1fb89
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-25 06:59:27 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
phf
9eed66d998
[CORE] FIX : Travis phptest (#incoterm).
2015-02-23 11:46:39 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
81130634d3
[CORE] intégration de incoterm sur les différentes class (#incoterm).
2015-02-23 09:16:14 +01:00
Laurent Destailleur
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Laurent Destailleur
6e66197621
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-20 23:49:06 +01:00
Laurent Destailleur
9e078b32d2
Fixes the way the RUM number is generated. Start phpunit test.
2015-02-20 18:35:52 +01:00
Laurent Destailleur
49cb36461c
Typo
2015-02-20 15:54:16 +01:00
Frédéric FRANCE
b73f1eb827
Update account.class.php
2015-02-19 08:40:38 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
Laurent Destailleur
ead6b4bf95
Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1830
Conflicts:
ChangeLog
2015-02-18 22:50:12 +01:00
Laurent Destailleur
89b9364837
Merge pull request #2337 from marcosgdf/bug-1822
...
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
2015-02-18 22:23:07 +01:00
frederic34
4bbbff8d69
Add BIC/SWIFT Validation
2015-02-17 22:04:16 +01:00
frederic34
f652cf4e97
Add translation for IBAN Valid or not
2015-02-17 17:02:38 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Laurent Destailleur
b00de9707a
Work on expensereport module
2015-02-15 19:13:16 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Laurent Destailleur
bedaa483ad
br useless
2015-02-14 20:40:10 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
6531a5c6c7
Fix: [ bug #1830 ] Salaries payment only allows checking accounts
2015-02-10 09:44:27 +01:00
Marcos García de La Fuente
d9ac21ab82
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
2015-02-08 16:54:41 +01:00
Maxime Kohlhaas
db9d727eb8
FIX : Link to user was wrong on bank transaction card
2015-02-08 12:36:55 +01:00
Laurent Destailleur
381af3e6bc
Field amount must be right aligned
2015-02-08 00:32:49 +01:00
Laurent Destailleur
24ad1afdd2
Merge pull request #2335 from atm-alexis/3.7
...
FIX empty discount where created if amount is null
2015-02-08 00:07:48 +01:00
Laurent Destailleur
aac584afda
Merge pull request #2320 from defrance69/patch-46
...
Update paiement.class.php
2015-02-07 23:46:40 +01:00
Alexis Algoud
0ca6661e69
FIX empty discount where created if amount is null for a line with a different tva
2015-02-07 23:42:35 +01:00
Laurent Destailleur
ef31ca9b84
New: Add balance of each account statement.
2015-02-07 23:32:46 +01:00
aspangaro
f23212eb22
Center title column & modify language key
2015-02-07 14:55:56 +01:00
aspangaro
ace524056e
Same problem
2015-02-07 14:34:04 +01:00
aspangaro
ba78b4c5e9
FIXED Missing language file
2015-02-07 14:18:02 +01:00
BENKE Charles
50ff9d2d0c
Update paiement.class.php
...
in case of sql query add error message in log instead of the screen
2015-02-04 02:17:37 +01:00
Marcos García de La Fuente
ef35483494
Fix: [ bug #1819 ] SQL error when searching for an invoice payment
2015-02-01 12:58:54 +01:00
Laurent Destailleur
21f72c7594
Fix regression
2015-01-31 17:10:19 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
29d399ba79
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 00:09:37 +01:00
Laurent Destailleur
0ea4a5db7d
Fixed: Error management on triggers
2015-01-31 00:08:45 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
aspangaro
6f3d9200bf
Correct link
2015-01-22 07:15:14 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
3554624537
Fix: A method must not change value of original property.
2015-01-18 23:32:13 +01:00
Laurent Destailleur
47baf232d4
Fix: A method must not change value of original property.
2015-01-18 23:02:53 +01:00
Frédéric FRANCE
69bb4b7b0b
Use account defined in invoice for pdf doc
2015-01-18 23:00:26 +01:00
Laurent Destailleur
f96fdc7d0a
Regression solved
2015-01-18 21:04:39 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Laurent Destailleur
ff65035aee
Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1717
Conflicts:
ChangeLog
2015-01-18 15:12:00 +01:00
Laurent Destailleur
7c5927ef93
Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1796
Conflicts:
ChangeLog
2015-01-18 15:08:49 +01:00
Laurent Destailleur
34fe87536b
Merge pull request #2137 from frederic34/printipp
...
Printing System which may accept modules
2015-01-18 13:09:41 +01:00
Frédéric FRANCE
6237f68e74
Update facture.class.php
2015-01-18 01:07:32 +01:00
Frédéric FRANCE
f763f23614
Update facture.class.php
2015-01-18 00:57:03 +01:00
Marcos García de La Fuente
003aa5ee44
Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount
2015-01-17 19:41:31 +01:00
Marcos García de La Fuente
7f59cf9194
Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
2015-01-17 19:28:27 +01:00
Laurent Destailleur
1664b89cef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 19:26:19 +01:00
Marcos García de La Fuente
41e01a22a3
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
2015-01-17 18:58:05 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
Laurent Destailleur
30abacd0a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527
Merge branch 'develop_bank_extrafields' of
...
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields
Conflicts:
htdocs/admin/bank.php
2015-01-17 14:42:04 +01:00
Frédéric FRANCE
a7d263c14e
Typo
2015-01-16 23:34:10 +01:00
Juanjo Menent
26e5efd71d
Improve code create function
2015-01-16 23:09:13 +01:00
Juanjo Menent
93d3ffb06f
Fix: PostgreSQL compatibilty
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-01-16 18:03:55 +01:00
Juanjo Menent
0d4aad4111
Fix: PostgreSQL compatibilty
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-01-16 17:59:58 +01:00
Juanjo Menent
fe5533d1c3
Fix: PostgreSQL compatibilty
2015-01-16 17:41:56 +01:00
Juanjo Menent
1930d0677e
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
Conflicts:
ChangeLog
2015-01-15 10:02:42 +01:00
Juanjo Menent
f03ffaf5a3
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
Conflicts:
ChangeLog
2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494
Fix: withdrawal create error if in the same month are deleted previus
...
withdrawals.
2015-01-15 09:57:20 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Laurent Destailleur
e24a668c52
Merge pull request #2225 from frederic34/psr2
...
Psr2
2015-01-09 22:53:06 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
frederic34
73fda2cb86
WIP PSR2
2015-01-08 18:36:03 +01:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Laurent Destailleur
033757aafd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-01-06 00:33:28 +01:00
Laurent Destailleur
443c9d245e
Merge pull request #2212 from marcosgdf/misc-doc
...
Miscellaneous corrections
2015-01-06 00:21:05 +01:00
Laurent Destailleur
e5f81b1fec
Merge pull request #2202 from defrance69/patch-38
...
Update facture.php
2015-01-06 00:13:55 +01:00
Laurent Destailleur
337d055872
Merge pull request #2199 from altatof/3.6
...
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
2015-01-06 00:10:08 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
BENKE Charles
2957c1445e
Update facture.php
...
$soc already filled upper if $socid filled
2014-12-28 12:34:21 +01:00
BENKE Charles
191d4467e3
Update facture.php
...
$soc already filled upper when $socid send
2014-12-28 12:31:27 +01:00
frederic34
e937039596
Merge remote branch 'upstream/develop' into printipp
2014-12-28 11:59:58 +01:00
Frédéric FRANCE
6e69d5c4bd
Typo
2014-12-27 11:28:10 +01:00
Christophe Battarel
1ab6955494
FIX: dont remove price ht if it is forced (ie: calculated by margin rate
...
and cost price, or by external module)
2014-12-27 11:27:41 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
5215b1e641
Merge pull request #2186 from marcosgdf/bug-575
...
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
2014-12-26 04:02:01 +01:00
Laurent Destailleur
2c350d1cc8
Merge pull request #2179 from frederic34/patch-11
...
Add css badge
2014-12-25 23:19:14 +01:00
Marcos García de La Fuente
aec1bdb3c4
Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice
2014-12-25 23:08:07 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Laurent Destailleur
dc4a874e70
Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors
2014-12-25 12:08:10 +01:00
Frédéric FRANCE
7001cd0283
Update index.php
2014-12-23 20:11:13 +01:00
Laurent Destailleur
aa618d481b
Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors
2014-12-23 13:07:16 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
frederic34
3bf63ed0a9
Merge remote branch 'upstream/develop' into printipp
2014-12-21 14:59:37 +01:00
Laurent Destailleur
bdb47921e7
Fixed: Bad value for % increase for first year.
2014-12-21 14:15:36 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
BENKE Charles
135d6c1d1f
Update facture.php
...
if socid is filled and send, they no need to get the thirdparty of the object
2014-12-14 18:03:30 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Frédéric FRANCE
37e5a97f84
Typo
2014-12-09 23:07:41 +01:00
Laurent Destailleur
63f2bfed24
Fixed: Maxi debug of withdrawal module.
2014-12-09 11:19:16 +01:00
frederic34
5cce8c45e3
WIP PrintIPP
2014-12-05 18:23:54 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
...
for release.
2014-12-04 13:20:56 +01:00
Frédéric FRANCE
650d4a3da9
Fix missing /form
2014-12-02 19:55:10 +01:00
Laurent Destailleur
c8e1c2bff4
Merge pull request #2113 from frederic34/patch-3
...
Fix missing /form
2014-12-02 19:54:46 +01:00
Laurent Destailleur
01209ff844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/card.php
2014-11-30 14:15:38 +01:00
Laurent Destailleur
b9ea7d4d13
Fix: Stock decrease from POS
2014-11-29 17:38:12 +01:00
Frédéric FRANCE
bff209a895
Fix missing /form
2014-11-28 08:25:51 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Laurent Destailleur
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
Frédéric FRANCE
bc58641828
Update Invoice Preview to be like order and propal preview
2014-11-27 22:07:18 +01:00
Laurent Destailleur
60e5369db2
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/bookmarks/card.php
2014-11-27 22:01:02 +01:00
Frédéric FRANCE
755732ce58
Update apercu.php
2014-11-26 20:35:08 +01:00
Frédéric FRANCE
96e0ecd1a7
Update Invoice Preview
2014-11-26 20:07:47 +01:00
Francis Appels
b1a4b8e7d0
Fix: [ bug #1624 ] POS set buy price for margin
...
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
2014-11-25 21:20:13 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Frédéric FRANCE
fbdd851875
Fix remove </a> not needed
2014-11-25 18:54:56 +01:00
Laurent Destailleur
6d2e024d52
Doxygen
2014-11-23 17:53:44 +01:00
Laurent Destailleur
3f655154c5
Merge pull request #2083 from frederic34/patch-2
...
Fix Typo
2014-11-23 17:47:43 +01:00
Frédéric FRANCE
979d6dffa2
Update /compta/paiement/cheque/list.php
2014-11-23 17:45:18 +01:00
Frédéric FRANCE
339415034e
Update /compta/facture/impayees.php
2014-11-23 17:44:45 +01:00
Frédéric FRANCE
ccff0f0952
Update /compta/facture/list.php
2014-11-23 17:44:41 +01:00
Frédéric FRANCE
9b731753e7
Update /compta/salaries/index.php
2014-11-23 17:44:37 +01:00
Frédéric FRANCE
fa89e310ae
Update /compta/paiement/list.php
2014-11-23 17:44:33 +01:00
Frédéric FRANCE
dd1c39b44e
Update /compta/bank/search.php
2014-11-23 17:44:29 +01:00
Frédéric FRANCE
2a79c2c826
Update /compta/sociales/index.php
2014-11-23 17:44:25 +01:00
Frédéric FRANCE
59494db8c1
Update /compta/tva/reglement.php
2014-11-23 17:44:21 +01:00
Frédéric FRANCE
8c839cc2a1
Update /compta/prelevement/list.php
2014-11-23 17:44:16 +01:00
Frédéric FRANCE
68ccb33def
Update /compta/deplacement/list.php
2014-11-23 17:44:13 +01:00
Frédéric FRANCE
045c2f9568
Update /compta/dons/list.php
2014-11-23 17:44:08 +01:00
Frédéric FRANCE
326e009cad
Fix Typo
2014-11-23 17:42:06 +01:00
Laurent Destailleur
652b0f84a7
Fixed: Field is used only by module accounting so must have a condition
...
on it.
2014-11-23 17:03:22 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
d8767bfbae
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-11-22 16:03:09 +01:00
Laurent Destailleur
eaa4b6cb56
Add PR manually because of conflict " #1678 & #1677 Untranslatable token"
2014-11-22 15:37:18 +01:00
Laurent Destailleur
d6f47227fe
Fixed: [ bug #1646 ] Can't list unpaid invoices
2014-11-22 15:09:54 +01:00
Laurent Destailleur
5acdce0b9f
Fixed: [ bug #1647 ] Can't list tax payments
2014-11-21 23:52:12 +01:00
Laurent Destailleur
ce98036725
Fixed: [ bug #1648 ] Can't see turnover report by product/services
2014-11-21 23:45:56 +01:00
Laurent Destailleur
80e62697f0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/bank/treso.php
2014-11-18 19:01:01 +01:00
aspangaro
31b90cf383
Add 1st version of calculator but need work
2014-11-17 06:38:06 +01:00
Laurent Destailleur
01279edfc8
Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank
...
planned transactions.
2014-11-16 16:36:32 +01:00
aspangaro
c256243bf7
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-16 08:41:39 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Christophe Battarel
7ed496d7d9
FIX: copy extrafields when creating order from propale and creating
...
invoice from order
2014-11-12 17:51:26 +01:00
aspangaro
c70539b3b2
Bug & merge
2014-11-12 07:33:03 +01:00
aspangaro
a55afd4f50
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-12 07:32:32 +01:00
Florian HENRY
9c795d2c4b
Finnish bank extrafeilds
2014-11-10 13:18:27 +01:00
Florian HENRY
e9f754395d
Start bank extrafields
2014-11-10 13:09:58 +01:00
aspangaro
3042bf4dc2
Correct lot of bugs
2014-11-10 06:08:50 +01:00
Laurent Destailleur
29298c73b9
Fix: Must show limit into list
2014-11-09 19:16:22 +01:00
aspangaro
9c3fa5a9eb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-09 07:26:14 +01:00
Laurent Destailleur
6fd89c4b41
Fix: Missing translation
2014-11-08 20:05:56 +01:00
Laurent Destailleur
6762b98c00
Minor look enhancement during debug
2014-11-07 23:25:39 +01:00
aspangaro
840dfd780d
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-07 21:28:39 +01:00
Drosis Nikos
24439eb1a3
Fix : tva not coming from multiprice
2014-11-07 15:31:06 +02:00
aspangaro
16126891a6
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-06 06:41:09 +01:00
aspangaro
89296e3011
Typo search list
2014-11-05 22:27:26 +01:00
Laurent Destailleur
60ca5aa026
Debug of module withdraw.
2014-11-05 17:32:42 +01:00
Laurent Destailleur
90fb05805c
Fix: Missing translation
2014-11-05 16:21:17 +01:00
aspangaro
cbfa90abca
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 20:57:05 +01:00
aspangaro
aecb985659
Update work
2014-11-04 20:53:07 +01:00
Laurent Destailleur
26bd214e72
Merge pull request #1996 from aspangaro/develop-search
...
Increase list search
2014-11-04 17:40:11 +01:00
Laurent Destailleur
0a0dd81c9a
Fix: When selecting a carbon copy fro select list, mail was not attached
...
to user.
2014-11-04 13:54:18 +01:00
aspangaro
25433120e6
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 06:16:03 +01:00
aspangaro
39e83576a2
prelevement list
2014-11-02 21:44:03 +01:00
aspangaro
5bf5b9b16f
Trips list
2014-11-02 21:12:40 +01:00
aspangaro
10ed271e38
Search bank transactions
2014-11-02 20:18:46 +01:00
aspangaro
1dcb7a58f3
Presentation & fix SQL injection
2014-11-02 14:51:21 +01:00
aspangaro
ff68c685c0
Customers payments list
2014-11-02 14:41:19 +01:00
aspangaro
6109529c6c
vat payments list & typo on css class
2014-11-02 14:19:28 +01:00
aspangaro
d6a42bda95
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-02 13:55:57 +01:00
Laurent Destailleur
5086450f35
Fix: Forging email content must use dol_concatdesc.
2014-11-02 12:32:38 +01:00
Laurent Destailleur
b74bdb8f7d
Fix: Bad error message
2014-11-02 11:39:30 +01:00
aspangaro
26c63f3ea4
donation list
2014-11-01 15:06:46 +01:00
aspangaro
5122b32ccc
Salaries list
2014-11-01 14:59:39 +01:00
aspangaro
a0d3dbd93c
Social Contrib list
2014-11-01 14:52:05 +01:00
aspangaro
9e07c3a7b6
Typo
2014-11-01 14:51:52 +01:00
aspangaro
abfa1a5fde
cheque list
2014-11-01 14:28:28 +01:00
Laurent Destailleur
2dc1cb7c27
Fix: Use correct permission on correct field.
2014-10-30 12:19:38 +01:00
Laurent Destailleur
47c2dc4fcf
Fix: Can see only trip allowed.
2014-10-30 11:36:04 +01:00
Laurent Destailleur
132ddf65d6
Fix: several bugs into document generation (default must be used in
...
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
2014-10-27 19:37:30 +01:00
Laurent Destailleur
6f77dc83c4
Qual: Uniformize code and fix a ton of bugs.
2014-10-27 03:24:45 +01:00
Laurent Destailleur
2b08417b77
Fix: [ bug #1612 ] Adding free product line line with negative qty in
...
credit notes, doesn't give error message
2014-10-27 01:51:33 +01:00
Laurent Destailleur
9619c0cdea
Fix: [ bug #1581 ] SQL injection possbile
2014-10-27 00:58:56 +01:00
Laurent Destailleur
4d515d660c
New: Feature to link manually an order to an invoice does not disappear
...
once link has been done.
2014-10-24 14:17:36 +02:00
Laurent Destailleur
4a60d57544
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/fiche.php
htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Laurent Destailleur
ad0f842b60
Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into
...
atm-maxime-mkoevols
Conflicts:
htdocs/commande/card.php
2014-10-18 15:38:49 +02:00
Laurent Destailleur
7988532e4e
Fix: Bad closing tab on preview pages.
2014-10-17 12:56:54 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Maxime Kohlhaas
ee4b807a5d
Qual : refactoring extrafields display on objects into a single tpl file
2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
68179c8794
Always editable option for extrafields on invoice and order
2014-10-14 16:13:17 +02:00
Laurent Destailleur
536b579b35
Clean code
2014-10-14 00:27:23 +02:00
Laurent Destailleur
cbbe909bc5
Fix: Pb in management of "or" ("|") for permission check.
2014-10-12 15:22:07 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Marcos García de La Fuente
f7a44347cb
Lowecased booleans to fit with PSR-2 specification.
2014-10-12 00:23:19 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
aspangaro
7fa2b6b3eb
Update
2014-10-06 05:34:45 +02:00
aspangaro
7e11fa06bb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-05 16:35:38 +02:00
Laurent Destailleur
968b021985
Fix trad and sql error
2014-10-05 05:37:01 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
c1db82a791
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-04 08:10:12 +02:00
Laurent Destailleur
d518278166
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/fiche.php
htdocs/compta/facture/class/facture.class.php
2014-10-03 19:17:28 +02:00
Laurent Destailleur
166853dd56
Fix: miscellaneous bugs
2014-10-03 12:15:21 +02:00
Laurent Destailleur
5ac63ec534
Solve fixme.
2014-10-03 02:00:50 +02:00
aspangaro
dca4591cdf
Add calculator
2014-10-02 20:00:35 +02:00
aspangaro
5fc82fdcd8
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-02 19:58:09 +02:00
aspangaro
ba7a4d6f88
Update card
2014-10-02 19:56:41 +02:00
Regis Houssin
2425fdfadd
FIXME $socid is not defined (strict mode)
2014-10-02 08:44:49 +02:00
aspangaro
3627f157d2
Add langs & debug
2014-10-01 07:16:29 +02:00
Maxime Kohlhaas
920c9c7251
Fix : tva not coming from multiprice
2014-09-30 17:36:01 +02:00
aspangaro
50c5b20d81
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-30 05:58:06 +02:00
aspangaro
f70e8b766f
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-09-29 20:40:53 +02:00
Laurent Destailleur
bbf07641ed
Fix: checkstyle
2014-09-29 20:39:19 +02:00
aspangaro
d3252d1348
Update
2014-09-29 20:37:51 +02:00
Drosis Nikos
8c6ce79d9d
Fix Lang for Payment Type
2014-09-29 18:15:09 +03:00
Laurent Destailleur
e35135d5b1
Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into
...
develop
Conflicts:
htdocs/compta/ventilation/card.php
htdocs/compta/ventilation/fournisseur/card.php
htdocs/compta/ventilation/fournisseur/list.php
htdocs/compta/ventilation/list.php
htdocs/core/menus/init_menu_auguria.sql
2014-09-29 16:31:35 +02:00
Laurent Destailleur
c6fc07e412
Merge pull request #1926 from fmarcet/3.6
...
Fix: Withdrawal total amount is double
2014-09-29 15:41:59 +02:00
Laurent Destailleur
ba33f73767
Merge pull request #1925 from tiaris/develop
...
adding hooks for supplier card and order card
2014-09-29 15:40:31 +02:00
aspangaro
250b57ca0a
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-28 14:00:26 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
jean
16facc81aa
Add link with order when invoice made for a shioppoing
2014-09-26 10:11:38 +02:00
fmarcet
7b9f154c29
Fix: Withdrawal total amount is double
2014-09-25 12:45:08 +02:00
Christophe Battarel
d1868b643e
FIX: clone line extrafields value on quote, order and invoice
2014-09-24 11:47:34 +02:00
aspangaro
3d23319226
Update
2014-09-24 04:10:29 +02:00
Laurent Destailleur
d6385fe1cc
Merge pull request #1917 from atm-alexis/feature_add_clone_to_social_contribution
...
add the clone action for a social contribution
2014-09-24 01:16:27 +02:00
aspangaro
a58025c601
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-23 21:24:29 +02:00
aspangaro
1e15474495
Continue working
2014-09-23 21:21:38 +02:00
Laurent Destailleur
74cba062b4
Add a TODO to explain why we keep some extends into class.
...
Should be removed once php min will be 5.4.
2014-09-23 19:37:59 +02:00
Alexis Algoud
691658cde3
add the clone action for a social contribution
...
- With option to clone it to the next month by default
2014-09-23 16:52:15 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Laurent Destailleur
bd6afa10ed
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-22 23:57:46 +02:00
Laurent Destailleur
4ff6b1ab1a
Merge branch 'KreizIT-predefined' into develop
...
Conflicts:
ChangeLog
2014-09-22 23:57:12 +02:00
Laurent Destailleur
d0da5ef047
Merge pull request #1910 from FHenry/develop
...
Better accountancy auto find accountancy code feature (work with several
2014-09-22 23:48:32 +02:00
aspangaro
c53663c885
Continue to work
2014-09-22 08:25:39 +02:00
aspangaro
1409c8f450
Continue to work
2014-09-21 21:38:33 +02:00
aspangaro
e147259e95
Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6
2014-09-21 20:30:55 +02:00
Marcos García de La Fuente
bf7f4c1cab
Refactored generateDocument functions
2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
ca9e33e809
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf
2014-09-21 18:00:56 +02:00
aspangaro
08b9e05425
New Module : Manage Financial Loan
2014-09-21 17:42:38 +02:00
Florian HENRY
565de5258f
Re-Add subtotal line on compta report (accidentaly remove before)
2014-09-20 09:19:26 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
aspangaro
6d26a7a46d
Merge remote-tracking branch 'Upstream/develop' into develop-accounting
2014-09-20 06:36:31 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
Laurent Destailleur
ee4d697172
Fix several bugs reported by scrutinizer
2014-09-19 14:57:31 +02:00
Laurent Destailleur
ca3c5d9513
Fix: invalid list of params
...
Fix: loading of sql menu
2014-09-19 14:36:55 +02:00
aspangaro
ab9226aab6
Delete elements have a link with old module ventilation - Replace today by module Accounting Expert
2014-09-19 05:55:54 +02:00
Raphaël Doursenaud
eea9a76589
FIX: Variable might not be traversable
2014-09-19 03:07:52 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
aspangaro
9da597d56e
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9
Uniformize code $_SERVER["PHP_SELF"]
2014-09-18 20:13:38 +02:00
Laurent Destailleur
e64e161a58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-18 17:54:24 +02:00
Laurent Destailleur
13abff1ed7
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
ChangeLog
2014-09-18 17:53:41 +02:00
Laurent Destailleur
2b69358c9c
Merge pull request #1896 from FHenry/develop
...
Add Dunning into accountancy report
2014-09-18 17:48:40 +02:00
Laurent Destailleur
46f117b0f9
Merge pull request #1902 from atm-maxime/mko_workonlists
...
Work on lists
2014-09-18 17:29:15 +02:00
Laurent Destailleur
65a69d3019
Fix: Bad field
2014-09-18 16:50:16 +02:00
Juanjo Menent
90edd96646
Fix: Invoices payments may be older than invoices
2014-09-18 10:11:39 +02:00
Juanjo Menent
ab83e22a12
Fix: Invoices payments may be older than invoices
2014-09-18 09:57:13 +02:00
Maxime Kohlhaas
3611ac673f
Add clear search icon on invoices list
2014-09-17 17:58:11 +02:00
Maxime Kohlhaas
9cc01635aa
Add clear search icon on unpaid invoices list
2014-09-17 17:56:53 +02:00
Florian HENRY
15d680ea4b
bad mege
2014-09-16 21:19:52 +02:00
Florian HENRY
fc65421b2e
bad merge
2014-09-16 21:19:07 +02:00
Florian HENRY
32c777a78b
Fix bad merge
2014-09-16 21:17:22 +02:00
Florian HENRY
bb612d24db
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
htdocs/compta/resultat/clientfourn.php
htdocs/compta/resultat/index.php
2014-09-16 21:09:53 +02:00
Florian HENRY
14ab058f34
Add Dunning into compta report
2014-09-16 21:05:57 +02:00
Marcos García de La Fuente
4b3191b64e
Removed deprecated usage of facture_pdf_create
2014-09-16 20:49:05 +02:00
Marcos García de La Fuente
e71dc6bc32
Created a method generateDocument for several classes
...
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
2014-09-16 12:30:37 +02:00
aspangaro
e1a40bd8bd
Merge remote-tracking branch 'Upstream/develop' into develop-cheque
2014-09-16 07:23:55 +02:00
aspangaro
0f3db1e912
Add more search field in list of cheque deposits
2014-09-16 07:21:29 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
2dbbc76645
Fix: Trigger error not reported
2014-09-15 11:48:50 +02:00
Laurent Destailleur
c4facf20e6
Merge branch 'bug-1546' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1546
Conflicts:
ChangeLog
2014-09-14 21:39:25 +02:00
Marcos García de La Fuente
7bac9444e6
[ bug #1546 ] Incorrect page number when searching in the list of bank transactions
2014-09-14 14:32:17 +02:00
Marcos García de La Fuente
949ae2f160
[ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
2014-09-14 13:09:31 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
2cfe088ee4
Better organization of accountancy menus
...
Fix: sql error with pgsql
2014-09-13 16:54:17 +02:00
Cedric
86d8870939
Add create button on predefined invoice details
...
Check invoice creation right
2014-09-11 17:33:47 +02:00
Laurent Destailleur
562c47dd62
Fix: colspan too low.
2014-09-08 12:00:25 +02:00
Laurent Destailleur
0cefe5af43
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/lib/date.lib.php
htdocs/fourn/facture/fiche.php
htdocs/includes/tcpdf/include/tcpdf_static.php
htdocs/product/price.php
2014-09-07 13:18:56 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
bc7d839c64
Fix: Missing status "refunded".
...
Fix: translation
2014-09-06 17:16:24 +02:00
Laurent Destailleur
996977a4a8
Fix: Missing user name
2014-09-06 17:10:52 +02:00
Laurent Destailleur
91a894f459
Fix: Missing user name
2014-09-06 17:10:22 +02:00
Laurent Destailleur
522b5a91bc
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:16:24 +02:00
aspangaro
f054d624cd
Merge branch 'Upstream/3.6'
2014-09-05 20:59:44 +02:00
Juanjo Menent
6c7d2cdd12
Merge pull request #1868 from aspangaro/develop-patch3
...
Bank card presentation on edit & create
2014-09-05 09:41:15 +02:00
Juanjo Menent
ffc730d82f
Merge pull request #1867 from aspangaro/develop-patch1
...
Payment VAT & Salaries :: Add controls on field required
2014-09-05 09:08:28 +02:00
Laurent Destailleur
643fc6c61f
Fix: Bad use of fetch_lines
...
Conflicts:
htdocs/comm/propal.php
htdocs/contrat/fiche.php
htdocs/opensurvey/class/opensurveysondage.class.php
2014-09-04 19:03:48 +02:00
Laurent Destailleur
73ad0f9302
Fix: Bad use of fetch_lines
2014-09-04 18:58:33 +02:00
Laurent Destailleur
da8a1cb475
Fix: Iban was used instead of Bic into SEPA file.
...
Fix: Must unaccent strings into SEPA file.
2014-09-04 15:38:20 +02:00
Laurent Destailleur
395209a5db
Fix: Reason to have button greyed is wrong
...
Conflicts:
htdocs/compta/facture/prelevement.php
2014-09-04 15:17:05 +02:00
Laurent Destailleur
4333e96ecb
Fix: Reason to have button greyed is wrong
2014-09-04 15:14:30 +02:00
aspangaro
fa6941efc6
Merge branch 'Upstream/develop'
2014-09-04 04:23:19 +02:00
aspangaro
2cba7ab9e6
Card presentation
2014-09-04 04:22:43 +02:00
aspangaro
291d70fa9d
Payment Salaries :: Add field required & control on it
2014-09-03 21:48:15 +02:00
aspangaro
058cf8782c
Payment VAT :: Add control on field required
2014-09-03 21:47:46 +02:00
aspangaro
4e05afdd66
Payment Salaries :: Add field required & control on it
2014-09-03 21:32:31 +02:00
aspangaro
bd99f3943d
Payment VAT :: Add control on field required
2014-09-03 21:31:40 +02:00
Laurent Destailleur
1eaf615426
Fix: no br after title
2014-09-03 14:32:59 +02:00
Laurent Destailleur
38233ca05d
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/limits.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/core/ajax/ziptown.php
2014-09-02 13:46:47 +02:00
Laurent Destailleur
17dec4b924
Fix: Bad merge
2014-09-02 13:05:03 +02:00
Laurent Destailleur
e82e26c6fa
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/compta/facture.php
htdocs/core/js/lib_head.js
2014-09-02 12:57:33 +02:00
Juanjo Menent
328b8b9643
Fix: Salary payments are not reflected on the reporting sheets
...
Conflicts:
ChangeLog
2014-08-28 15:29:31 +02:00
Juanjo Menent
0e1f22fe26
Fix: Salary payments are not reflected on the reporting sheets
2014-08-28 15:16:14 +02:00
Laurent Destailleur
d3a3e8786e
Fix: sql request with pgsql
2014-08-28 15:08:24 +02:00
Laurent Destailleur
3e2ed270e1
Fix: sql request with pgsql
2014-08-28 15:07:33 +02:00
Laurent Destailleur
2cba55758b
Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into
...
KreizIT-fix_1544
Conflicts:
ChangeLog
2014-08-21 23:29:38 +02:00
Laurent Destailleur
86d91ff698
Fix: Setting new property of object must be done only after all database
...
actions are ok (and if ok).
2014-08-19 15:03:55 +02:00
Maxime Kohlhaas
e760201a59
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
2014-08-14 14:26:01 +02:00
Maxime Kohlhaas
c6637207f8
Fix : VAT and NPR rates where coming from multiprice...
2014-08-14 14:25:41 +02:00
Cedric
8670a89ecb
Fix #1544 : Can remove date from invoice
2014-08-14 08:41:24 +02:00
Laurent Destailleur
d6c4993c40
Merge pull request #1822 from Devensys/Devlop-PayTotalButton
...
Add button to fill amount paiement
2014-08-14 01:28:20 +02:00
Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb
Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-accounting3
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-14 00:59:48 +02:00
Laurent Destailleur
abb845b579
Merge pull request #1813 from atm-maxime/mkoevols
...
Add payment mode in invoice list
2014-08-14 00:21:34 +02:00
Laurent Destailleur
351705b76b
Merge pull request #1812 from atm-maxime/mkoshipment
...
New : After commit b7ee10a074
2014-08-14 00:20:31 +02:00
Laurent Destailleur
cc86e280f9
Merge branch 'task712' of github.com:KreizIT/dolibarr into
...
KreizIT-task712
Conflicts:
ChangeLog
2014-08-14 00:18:51 +02:00
Florian HENRY
eca9408c91
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-12 12:37:31 +02:00
Andrelec1
49d1983acd
trigger on total
...
Add hook on js for total
2014-08-12 11:40:24 +02:00
Andrelec1
1ce4996a34
finish implement
...
remove old code and add new one ...
2014-08-12 11:34:53 +02:00
Maxime Kohlhaas
c207daa18c
Revert invoice list
2014-08-11 10:07:09 +02:00
aspangaro
9af336b53b
Add accountancy code for trips & fees and renamed libelle field into label
2014-08-10 20:41:52 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
Laurent Destailleur
75eb9cadc7
Merge pull request #1809 from KreizIT/fix_1549
...
Fix : [ bug #1549 ] It's not possible add ExtraFields
2014-08-08 01:52:13 +02:00
Laurent Destailleur
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +02:00
Laurent Destailleur
91aabbb40e
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/main.inc.php
2014-08-08 01:19:03 +02:00
KreizIT
973d61fe13
[ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice
2014-08-07 16:23:02 +02:00
Laurent Destailleur
de76fe4951
Fix: Missing join into request.
...
Conflicts:
htdocs/compta/facture.php
2014-08-07 15:05:31 +02:00
Laurent Destailleur
1239e713c9
Fix: Missing join into request.
2014-08-07 15:00:10 +02:00
Laurent Destailleur
80653409a2
Fix: Missing join into request.
2014-08-07 14:57:08 +02:00
Maxime Kohlhaas
7deacdf851
New : After commit b7ee10a074 don't add product with qty 0 in invoices
2014-08-07 14:07:44 +02:00
Maxime Kohlhaas
885c26f27b
Ajout du mode de règlement dans la liste des factures et dans la liste des impayées
2014-08-07 13:50:25 +02:00
KreizIT
c94c0699d8
Fix : [ bug #1549 ] Itïs not possible add ExtraFields
2014-08-06 17:38:44 +02:00
Laurent Destailleur
1751b58ef8
New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or
...
content template.
2014-08-06 00:46:00 +02:00
Laurent Destailleur
164c9e0b75
New: Can defined a bcc for each email type.
2014-08-05 09:28:58 +02:00
Laurent Destailleur
c2be3364e0
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2014-08-04 22:18:30 +02:00
Laurent Destailleur
4e8ec8e598
Revert "Add Reduction value in pdf"
...
This reverts commit 0b5707c1cf
2014-08-04 18:36:18 +02:00
Laurent Destailleur
50f18ff939
Merge pull request #1801 from fmarcet/develop
...
Fix: Optimize Price by Customer
2014-08-04 09:12:35 +02:00
Laurent Destailleur
8d867dde69
Merge pull request #1797 from Devensys/Develop-AddValueReduction
...
Add Reduction value in pdf
2014-08-04 09:01:45 +02:00
fmarcet
67a7a210fd
Fix: Optimieze Price by Customer
2014-08-01 16:17:31 +02:00
Florian HENRY
44f06bef22
Unpaid invoice launch fusion PDF action even if it is only search (with
...
enter keyboard input instead of lens click)
2014-08-01 15:21:29 +02:00
Laurent Destailleur
605919be76
Fix: Too many parameter
...
Fix: Can't delete bank account
2014-08-01 14:51:40 +02:00
Andrelec1
0b5707c1cf
Add Reduction value in pdf
...
Add value of %reduction in pdf
2014-08-01 14:49:42 +02:00
Laurent Destailleur
07cf09536d
Fix: delete bank account
2014-08-01 14:48:48 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
1c97b3f779
Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode
2014-07-30 15:47:19 +02:00
Marcos García de La Fuente
972d3c69b6
Removed duplicated requires.
...
Json.lib.php is included with functions.lib.php
2014-07-30 15:42:58 +02:00
aspangaro
dcb507fd37
Presentation invoice page
2014-07-29 06:55:28 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Léonard
0228cd9db7
Fix translations in e-mail forms
2014-07-28 02:45:58 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
frederic34
f08f4d7c5e
Update facture.php
...
Remove a space
2014-07-21 09:18:14 +02:00
Florian HENRY
cf63f1a40d
Remane contract ref_ext to ref_supplier
2014-07-21 08:36:59 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc
Migrated old error notifications to the """new""" system
2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
nicoplh
2cfc5f10a8
Update impayees.php
...
remove useless type alpha.
2014-07-18 14:47:23 +02:00
nicoplh
25a591bd03
Update impayees.php
...
Add column ref.Client with search module.
2014-07-17 16:21:23 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Juanjo Menent
893240ce21
Qual: Uniformize code. Errors
2014-07-12 09:48:10 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
KreizIT
971ae8ae59
Refactor: TVA_* trigger
2014-07-11 15:01:51 +02:00
Laurent Destailleur
728ca22183
Merge pull request #1730 from GPCsolutions/accessibility
...
Accessibility
2014-07-11 14:57:02 +02:00
KreizIT
a7afb5bdae
Refactor: PAIEMENT_SALARY_* trigger
2014-07-11 14:54:32 +02:00
KreizIT
c1a004106d
Refactor: LOCALTAXE_* trigger
2014-07-11 14:47:44 +02:00
KreizIT
fc61cc9bfa
Refactor: BILL_* and LINEBILL_* trigger
2014-07-11 14:36:13 +02:00
Raphaël Doursenaud
f6848e8655
Add label on search boxes
2014-07-11 13:26:02 +02:00
Laurent Destailleur
5e75dd27e8
Merge pull request #1719 from frederic34/selectbank
...
Select bank account for propal order and invoice
2014-07-11 12:29:21 +02:00
Laurent Destailleur
5c81074483
Merge pull request #1709 from KreizIT/review_trig2
...
Review trig2
2014-07-11 12:27:43 +02:00
frederic34
742bdcb715
Set bank account for supplier invoices
2014-07-09 18:44:20 +02:00
frederic34
c8e6387e52
Merge remote branch 'upstream/develop' into selectbank
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
frederic34
865fea37e9
Correct filter
2014-07-08 16:02:46 +02:00
frederic34
a2911cef11
Filter on invoice for "treso"
2014-07-08 11:46:22 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
frederic34
0cb5220d4d
Use english for the function name
2014-07-07 20:54:41 +02:00
frederic34
8e612b532a
Use & instead &
2014-07-07 18:44:08 +02:00
frederic34
83d3af9bf8
Select account for payment
2014-07-07 18:25:20 +02:00
frederic34
516632e41d
Select bank account for customer order
2014-07-07 17:59:04 +02:00
Juanjo Menent
74b42f6cb4
[ task #1063 ] Allow edit localtaxes rate for thirds
2014-07-04 17:31:34 +02:00
Juanjo Menent
65d303999f
[ task #1063 ] Allow edit localtaxes rate for thirds
2014-07-04 17:26:21 +02:00
Juanjo Menent
8e4e08f907
[ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu
2014-07-04 16:48:42 +02:00
KreizIT
c70bdabeda
Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
2014-07-04 16:23:10 +02:00
Juanjo Menent
4063260cc8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-04 16:16:52 +02:00
Juanjo Menent
fdb938af0f
[ task #1063 ] Allow edit localtaxes rate for thirds. Remove country
...
condition
2014-07-04 13:44:26 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Laurent Destailleur
8c306a968f
Merge pull request #1704 from KreizIT/review_trig
...
Review user trigger
2014-07-04 13:20:32 +02:00
Juanjo Menent
747b6a9f94
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports
...
and payments
2014-07-04 12:50:55 +02:00
Juanjo Menent
416577a6aa
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with
...
invoices
2014-07-04 11:41:43 +02:00
KreizIT
023e7ce8ce
FIX : [ bug #1502 ] DON_CREATE trigger does not intercept trigger action
...
- Add DON_CREATE in interface_90_all
- Add new trigger DON_UPDATE, DON_DELETE
2014-07-03 16:04:12 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
b985dc3342
Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-accounting
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/install/mysql/tables/llx_bank_account.sql
2014-06-30 00:42:17 +02:00
Laurent Destailleur
14de1d66c0
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-29 23:56:23 +02:00
Laurent Destailleur
e2472351c3
Merge branch 'fix1487' of github.com:KreizIT/dolibarr into
...
KreizIT-fix1487
Conflicts:
ChangeLog
2014-06-29 23:42:38 +02:00
aspangaro
5cc8ec4f5f
Add accountancy code journal into bank card & modify presentation
2014-06-29 20:10:43 +02:00
Florian HENRY
e8bb5d5cc0
Syntax
2014-06-29 17:43:22 +02:00
Florian HENRY
1857280234
Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if
...
not defined for customer
2014-06-29 17:39:54 +02:00
Laurent Destailleur
bb2e843fc9
More visible information on predefined invoices.
2014-06-29 14:03:14 +02:00
Laurent Destailleur
198a8d40f7
Fix: Missing translation
2014-06-29 13:53:07 +02:00
Laurent Destailleur
03c6d8fdc3
New: Can create proposal from an intervention.
2014-06-28 19:47:51 +02:00
Laurent Destailleur
2c493a4fe3
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-06-28 14:55:04 +02:00
KreizIT
a153480bc6
Fix : [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
...
Change trigger call to new function call_trigger
2014-06-27 13:48:23 +02:00
Juanjo Menent
773caf808e
[ task #867 ] Remove ESAEB external module code from core
2014-06-27 09:09:54 +02:00
Juanjo Menent
6ce1ef08cf
[ task #867 ] Remove ESAEB external module code from core
2014-06-27 09:09:08 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Laurent Destailleur
fc4493242a
Merge pull request #1685 from KreizIT/3.6
...
FIX : #1477 , #1478 , #1479
2014-06-26 21:00:26 +02:00
Laurent Destailleur
018e1d31e3
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/class/product.class.php
htdocs/projet/class/project.class.php
2014-06-25 20:22:25 +02:00
Cedric
ee91f4a3f7
FIX : #1477 , #1478 , #1479
2014-06-25 13:37:55 +02:00
Laurent Destailleur
76532218c2
Fix: [ bug #1476 ] Invoice creation form loses invoice date when there
...
is a validation error
2014-06-21 15:35:30 +02:00
Laurent Destailleur
39eea995a4
Merge pull request #1675 from FHenry/3.5
...
Fix == instaed of = in variable affectation
2014-06-20 16:52:44 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Florian HENRY
d09ccf5855
Fix == instaed of = in variable affectation
2014-06-20 13:21:49 +02:00
Laurent Destailleur
e7f08c6d37
Merge pull request #1674 from atm-maxime/3.5
...
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
2014-06-20 13:20:50 +02:00
Laurent Destailleur
51eb761b02
Merge pull request #1669 from aspangaro/develop-patch1
...
Correction on 3.6beta
2014-06-20 13:12:39 +02:00
Maxime Kohlhaas
aaabf9647d
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix)
2014-06-20 09:33:25 +02:00
Maxime Kohlhaas
bd21a559da
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-06-20 09:06:36 +02:00
Florian HENRY
0645189432
If multiprice level is used the VAT on addline is not correct
2014-06-18 10:56:38 +02:00
Florian HENRY
9bb537f399
- New: If multilangue is enabled, mail (from propal, invoice, etc...)
...
message is pre-defaulted in Customer language
2014-06-18 09:59:15 +02:00
aspangaro
516363f491
Bank - Enhance readability
2014-06-17 06:43:50 +02:00
Laurent Destailleur
4c0fe98ae2
Merge pull request #1665 from atm-maxime/develop
...
Fix 1480, 1483, 1497 $this instead of $object
2014-06-14 14:13:10 +02:00
Maxime Kohlhaas
19a3194b02
Fix : duedate was not auto calculated + move calculation function to common invoice class
2014-06-14 12:53:02 +02:00
Maxime Kohlhaas
d0a417ad36
Fix 1480, 1483, 1497 $this instead of $object
2014-06-14 11:37:57 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
frederic34
88c5d6e5d1
Display the total with currency
2014-06-11 18:01:14 +02:00
frederic34
89547dde37
Display the total by currency account
2014-06-11 17:42:03 +02:00
Marcos García de La Fuente
ae4bd4445e
Moved dol_syslog query log to the database handler and decreased report level to DEBUG
2014-06-09 15:49:54 +02:00
Marcos García de La Fuente
9344123887
CR Fix
2014-06-09 15:25:31 +02:00
fmarcet
66606b42ca
Fix: Serious bug on withdrawal
2014-06-06 17:06:30 +02:00
Laurent Destailleur
e5bd170114
Add comment
2014-05-30 11:21:24 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
4076a4a643
Fix: select_date accepts -1, '' or a date but not '0'
2014-05-25 14:51:56 +02:00
Laurent Destailleur
8e7b310fb6
Fix: [ bug #1400 ] Silent Warning create a draft invoice
2014-05-25 05:01:14 +02:00
Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Regis Houssin
b39627288e
Fix: missing hookmanager global
2014-05-21 11:48:45 +02:00
Raphaël Doursenaud
c3f05d1c1c
Withdrawals: fixed bad translation key
2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
3209483f1b
Bank search: Better wording
2014-05-19 14:38:26 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
d7d8eba6b1
Merge pull request #1592 from atm-alexis/3.5_adding_page_to_list_product_as_other_list
...
Fix page numerotation for product, invoice and others as in company list
2014-05-14 11:26:22 +02:00
Laurent Destailleur
f621f7eb32
Fix: The rounding mode is now forced when provided explicitly and no
...
more by default (we keep data intact when no mode provided).
2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459
Fix: The way we tested if a ref/id already exists was wrong. Introduce a
...
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
2014-05-13 10:12:45 +02:00
Laurent Destailleur
bd061f4245
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
...
report
2014-05-13 01:29:01 +02:00
Laurent Destailleur
18848eaf74
Clean forms
2014-05-12 13:25:36 +02:00
Laurent Destailleur
3393b1c5fb
Fix: Date of invoice is set to current date when cloning. // TODO Best
...
is to ask date into confirm box.
2014-05-12 12:15:54 +02:00
Laurent Destailleur
64f8dcf131
Fix: Bad syntax of vars
2014-05-12 12:10:52 +02:00
Alexis Algoud
f13c146908
Fix page numerotation as in company list
2014-05-12 11:00:58 +02:00
aspangaro
4025fda62a
Merge branch 'upstream/develop'
2014-05-11 20:53:15 +02:00
Laurent Destailleur
bafc53ad95
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error
2014-05-11 19:05:51 +02:00
Laurent Destailleur
76330ad04a
Fix: [ bug #1383 ] When add a salary payment - In bank, link "user"
...
doesn't work
2014-05-11 18:35:25 +02:00
aspangaro
bb5d800524
Print instead of echo
2014-05-11 06:49:11 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Laurent Destailleur
f95c87f1d6
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
...
work but it does not enable it
2014-05-10 18:57:04 +02:00
Laurent Destailleur
f36b9effe8
Fix: [ bug #1373 ] Required type of payment input is not visible
2014-05-10 17:22:12 +02:00
Laurent Destailleur
3fd7e18c08
Fix: Bad translation into title of action buttons
2014-05-10 17:00:55 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
5a6ad1ef5f
Fix: [ bug #1362 ] Note is not saved
...
Fix: tr/td balance.
2014-05-06 23:19:48 +02:00
Laurent Destailleur
5e12459ad1
Fix: Ref and date for social contributions payments were merged into on
...
field making not possible to click on ref.
2014-05-06 22:54:33 +02:00
Laurent Destailleur
131f133e07
New: Merge free product and predefined product area to enter new
...
product (Supplier orders now use same template than customer
orders/proposal/invoices).
2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46
New: Merge free product and predefined product area to enter new
...
product.
2014-05-05 14:30:08 +02:00
Laurent Destailleur
c2c0a9b4bb
Merge pull request #1568 from GPCsolutions/closingtagremoval
...
Qual: Remove the closing PHP tag
2014-05-04 18:08:37 +02:00
Laurent Destailleur
bc35728ea3
Merge pull request #1562 from marcosgdf/translation
...
Improved translations
2014-05-04 17:39:36 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
12aa541db4
Clean code
2014-05-02 17:58:26 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Marcos García de La Fuente
5d46115dd3
Missing translation of transaction types in releve detail
2014-05-01 16:32:04 +02:00
Laurent Destailleur
6a200105b9
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
ChangeLog
2014-05-01 11:16:42 +02:00
Laurent Destailleur
3719fc1234
Merge pull request #1557 from defrance69/develop
...
export extrafields on bill & set real ref bordereau number
2014-05-01 11:09:16 +02:00
aspangaro
270e58637f
Salaries payments :: Add sortfield & search
2014-05-01 08:58:19 +02:00
aspangaro
ca0b6c26df
Translation
2014-05-01 08:19:55 +02:00
aspangaro
3b265c8d53
TVA :: Add sortfield & search
2014-05-01 07:44:10 +02:00
aspangaro
c6e2afb11e
Social contrib. :: Replace index.php by $_SERVER["PHP_SELF"]
2014-05-01 05:57:27 +02:00
Laurent Destailleur
880f77b7e1
Fix: Preview feature
2014-04-30 13:50:25 +02:00
aspangaro
4caedaf3e5
Salaries : typo & presentation
2014-04-30 06:38:36 +02:00
aspangaro
eb926103e0
TVA : Add type_payment & num_payment who are missing
2014-04-30 06:37:47 +02:00
aspangaro
11b0bc4b38
Merge branch 'upstream/develop'
2014-04-30 04:58:07 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
aspangaro
06b386443d
Merge branch 'upstream/develop'
2014-04-29 06:37:39 +02:00
Laurent Destailleur
4cb671f4db
Qual: Clean deprecated code.
2014-04-28 11:55:08 +02:00
aspangaro
bab54f8264
Type bank & tva
2014-04-28 06:41:27 +02:00
aspangaro
73eec6b872
Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated
2014-04-28 04:53:39 +02:00
aspangaro
9ff3dc6189
Fix :: MySql Problem when create a salary payment
2014-04-28 04:43:17 +02:00
aspangaro
e03be4f6ed
HRM Area - Typo & presentation
2014-04-27 04:08:34 +02:00
Laurent Destailleur
01655d1757
New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send
...
invoice
by email whatever is its status.
2014-04-23 13:14:55 +02:00
Florian Henry
0d1697589e
syntax
2014-04-13 20:39:40 +02:00
Florian Henry
7d84c573ab
syntax travis ruleset.xml
2014-04-13 18:57:35 +02:00
Florian Henry
57e4453ea2
Add filter date and total line on bank writing list page
2014-04-13 18:26:21 +02:00
aspangaro
bae2fe0921
Merge branch 'upstream/develop'
2014-04-12 09:51:19 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
5843668dbe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-04-11 19:02:59 +02:00
Laurent Destailleur
417a1232ef
Uniformize usage of function price
2014-04-11 18:00:58 +02:00
Juanjo Menent
f458c384d7
Fix: Can not make withdrawals
...
Conflicts:
ChangeLog
2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232
Fix: Can not make withdrawals
2014-04-11 12:07:01 +02:00
Laurent Destailleur
55599f9455
Fix: MAIN_AUTOFILL_DATE was broken in some cases.
2014-04-10 19:47:52 +02:00
Laurent Destailleur
ebb9016ad5
Fix: missing 'ifone' into param
2014-04-02 19:34:42 +02:00
Laurent Destailleur
9a8a306d78
Qual: Method form->select_currency() has been removed. Use instead
...
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
918fe5dbb5
Fix: [ bug #1318 ] Problem with enter key when adding an existing
...
product to a customer invoice
2014-04-02 11:58:59 +02:00
Laurent Destailleur
f891e1ac42
Fix: use currency into price function
2014-04-02 00:01:06 +02:00
Laurent Destailleur
c81406c7f3
Fix: CI
2014-03-31 02:41:15 +02:00
Laurent Destailleur
39f48f25db
Fix: Trip and expenses were moved into menu hrm
2014-03-31 01:48:50 +02:00
Laurent Destailleur
d48cbeb720
Fix: W3C
2014-03-31 01:45:48 +02:00
Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
3d8fb60f94
Start to implement sepa format. Need serious tests.
2014-03-30 20:22:54 +02:00
aspangaro
6e0788c8c1
Merge branch 'upstream/develop'
2014-03-30 08:07:07 +02:00
Laurent Destailleur
81306ff1d0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-29 17:38:29 +01:00
Laurent Destailleur
a5c2b78565
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-29 17:38:06 +01:00
Laurent Destailleur
88a4af394c
Removed dead or useless code.
2014-03-29 14:12:01 +01:00
aspangaro
52cd8792b7
Merge branch 'upstream/develop'
2014-03-29 06:50:34 +01:00
Laurent Destailleur
205c0ac62d
Fix: invert logic. Show child options when parent option is
...
selected instead of selected parent when a child is selected.
2014-03-29 05:18:24 +01:00
Laurent Destailleur
61f649e1ae
Fix: When select_date is called with '' as preselected date,
...
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
2014-03-29 04:26:44 +01:00
Juanjo Menent
a1fb21114b
New: Add some hooks for financial reports
2014-03-28 18:31:43 +01:00
aspangaro
e0dc01fe85
Merge branch 'upstream/develop'
2014-03-28 12:37:42 +01:00
Laurent Destailleur
4d4512fadd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-26 22:14:14 +01:00
Laurent Destailleur
9e771269c4
Qual: clean code
2014-03-26 20:46:17 +01:00
Laurent Destailleur
62a990d6cc
Fix: ajax_combobox function must be included before called.
...
New: Feature of module survey are now localized into top menu "Tools".
2014-03-26 16:02:22 +01:00
Laurent Destailleur
c45f509984
Qual: Uniformizing payments
2014-03-26 15:41:09 +01:00
Laurent Destailleur
59042a30e1
Fix and uniformize code for payment of salaries.
2014-03-25 21:35:52 +01:00
Laurent Destailleur
4828d1e89a
New: Uniformize visible information on payment lists.
2014-03-25 20:24:51 +01:00
Laurent Destailleur
a5e8063cfd
Fix: Bad management error
2014-03-25 20:09:30 +01:00
Florian Henry
bb07d7f814
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-03-24 13:25:35 +01:00
Laurent Destailleur
f115501ddf
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-24 00:16:47 +01:00
Laurent Destailleur
57bd043f59
Fix: Missing lang loading
2014-03-23 20:30:54 +01:00
aspangaro
bc48ddd3fc
Présentation
2014-03-23 16:33:05 +01:00
aspangaro
7e1035171c
Merge branch 'upstream/develop'
2014-03-22 05:55:14 +01:00
Florian Henry
c8c4a10a06
Fix restrictedearea bug
2014-03-21 16:18:17 +01:00
Florian Henry
10fda1956f
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-03-21 14:41:18 +01:00
aspangaro
07d6464720
Trips & expenses move into hrm area
2014-03-20 06:38:07 +01:00
Laurent Destailleur
a9aaac8e15
Fix: Date was lost if error during submit.
2014-03-20 00:05:20 +01:00
Laurent Destailleur
68396e023c
New: When creating an invoice all types are visible (even if for the
...
moment we just show an help text to explain how to use type credit note
and deposit).
2014-03-19 23:49:07 +01:00
Laurent Destailleur
caf1eba4e2
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
2014-03-19 22:59:10 +01:00
Laurent Destailleur
4afb85bd1d
Fix: Several fix into workflow/condition for invoice payments or convert
...
into discount.
2014-03-19 22:30:25 +01:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
aspangaro
4d6d7c19b2
Correct typo
2014-03-17 21:47:06 +01:00
Laurent Destailleur
7eea96c07c
Minor fix into standing order.
2014-03-17 20:43:01 +01:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Florian Henry
649f535d56
delete extrafield on delete invoice
2014-03-15 19:49:21 +01:00
Laurent Destailleur
ad23c88f1a
Merge pull request #1481 from atm-maxime/mko672
...
Add : Stock can be mandatory to use a product
2014-03-15 17:29:31 +01:00
Maxime Kohlhaas
1911f6fcdc
Task 672 : add stock limitation on shipment + translation
2014-03-15 14:59:27 +01:00
Alexis Algoud
839641feaf
Add option to set value of credit note by invoice lake of payment
2014-03-15 14:52:08 +01:00
Laurent Destailleur
7a304bff62
Merge pull request #1478 from atm-alexis/develop
...
Add feature : import line from origin invoice in the new credit note
2014-03-15 13:48:12 +01:00
Maxime Kohlhaas
b6a2fa61c8
Task 672 : only for product not services
2014-03-15 12:47:01 +01:00
Maxime Kohlhaas
9c340d7af8
Task 672 : Prevent use of product not available
2014-03-15 12:45:56 +01:00
Alexis Algoud
3a21d99edf
Add feature : import line from origin invoice in the new credit note
2014-03-15 12:01:13 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +01:00
Florian Henry
3f6b319d41
Fix deposit invoice
2014-03-14 23:42:45 +01:00
Laurent Destailleur
1b85f83dbb
Merge pull request #1466 from marcosgdf/minor
...
Minor style and translation corrections
2014-03-13 11:53:52 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
86ad05c22e
Merge pull request #1461 from marcosgdf/unknown-error
...
Corrected Unknown error message typo
2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
0a603777ae
Added missing spacing
2014-03-11 11:27:06 +01:00
aspangaro
99b2dfda77
Correct Travis Error
2014-03-11 10:52:49 +01:00
aspangaro
d97f9e50cd
Merge branch 'upstream/develop'
2014-03-11 10:40:22 +01:00
Laurent Destailleur
932b421d1d
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-11 09:46:51 +01:00
aspangaro
12ffb19cec
Use more explicit name for class and functions
2014-03-11 06:26:18 +01:00
aspangaro
61a5735300
Rename "Sal" class into "Salaries"
2014-03-10 21:17:03 +01:00
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7
Fix: Must use div for columns of index pages. Not table.
2014-03-10 17:19:02 +01:00
aspangaro
74d3fdae15
Update langs & fix period for salaries in tax module
2014-03-07 06:42:48 +01:00
aspangaro
048b3c01ce
Add salary payment in tax module - Link to user.
...
Necessary for future hrm module.
2014-03-06 21:21:16 +01:00
Laurent Destailleur
b762c66c8a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-06 18:04:19 +01:00
Laurent Destailleur
270eaf7aca
Qual: Uniformize search date for lists.
2014-03-06 17:02:27 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
7d7a72b8f1
More interactive autoselect of fields
2014-03-01 20:02:35 +01:00
Laurent Destailleur
d69cee03d8
More interactive autoselect of fields
2014-03-01 19:45:13 +01:00
Laurent Destailleur
c6fb7996ba
Fix: [ bug #1238 ] When creating accompte with a %, free product are
...
used for calculation.
2014-03-01 19:11:13 +01:00
Laurent Destailleur
19b68e87e9
Merge branch 'bug-1123' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1123
Conflicts:
ChangeLog
2014-03-01 13:29:34 +01:00
Laurent Destailleur
a453d24eea
Merge pull request #1437 from marcosgdf/invoice-types
...
Replacing invoice integer types with Facture and FactureFournisseur constants
2014-02-27 11:11:19 +01:00
Laurent Destailleur
f7fe25e408
Uniformize code to prepare mass update
2014-02-27 10:37:23 +01:00
Marcos García de La Fuente
0eedadd7f2
Replacing invoice integer types with Facture constants
2014-02-26 01:09:22 +01:00
Marcos García de La Fuente
8099d7ff42
Replacing invoice integer types with Facture constants
2014-02-26 01:03:26 +01:00
Marcos García de La Fuente
ad928cb443
Replacing invoice integer types with Facture constants
2014-02-26 00:56:36 +01:00
Marcos García de La Fuente
f464528dd9
Corrected indentation to tabs
2014-02-25 01:18:29 +01:00
Marcos García de La Fuente
e83e2bbbd7
Fixed bug #1123 : Paid deposit invoices are always shown as partially paid when fully paid
2014-02-25 01:17:38 +01:00
Marcos García de La Fuente
e90f068e3b
Documented invoice types
2014-02-25 01:10:18 +01:00
Laurent Destailleur
f537f62aea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/impayees.php
2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743
New: Sending remind of unpayed invoices by emails (need tester)
2014-02-24 16:50:36 +01:00
Laurent Destailleur
37d2d990af
Add comment into doc
2014-02-24 10:17:56 +01:00
Florian Henry
ec8ad9f8bb
codesniffer
2014-02-23 20:10:05 +01:00
Florian Henry
720746b1b2
Fix php sniffer
2014-02-23 16:29:16 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
Florian Henry
e3ca6cf3d3
Fix phpunit code siffer errors
2014-02-23 10:47:51 +01:00
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +01:00
Laurent Destailleur
860ca15cfc
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2014-02-17 15:27:30 +01:00
Laurent Destailleur
abc96b51fa
Enable extrafields for customer order, proposal and invoice lines. This
...
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
2014-02-16 23:51:29 +01:00
Laurent Destailleur
908c39098d
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
3aba53a9ae
Fix: javascript calculation of unit price from margin rate was broken.
2014-02-16 19:26:41 +01:00
Laurent Destailleur
b499efeccf
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/compta/sociales/index.php
htdocs/compta/tva/index.php
2014-02-12 22:29:56 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
e71fb36b3c
Add patch ISO 9362 http://fr.wikipedia.org/wiki/ISO_9362 manually.
...
We keep bic size field to 20 instead of 11 for backward compatibility.
2014-02-10 01:08:49 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
fdfb7f1a8a
Fix: Be sure there is no duplicate default rib.
2014-02-08 03:24:48 +01:00
Laurent Destailleur
9e06f185c5
Fix: Fix problem of invalid paypal link with \n.
2014-02-06 18:19:49 +01:00
Laurent Destailleur
7078970ed1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2014-02-05 21:03:05 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
db006dcdf8
Fix: Missing lang->load
2014-02-05 12:52:00 +01:00
Laurent Destailleur
f8a68b0449
Fix: Missing translation
2014-02-04 20:57:22 +01:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +01:00
Laurent Destailleur
e5cd32623c
Qual: Uniformize code of payment between customer and supplier payments.
...
New: Add warning if supplier payment is higher that due amount.
2014-02-03 18:42:24 +01:00
Laurent Destailleur
85436f871c
Sec: Missing permission tests
2014-01-30 11:48:14 +01:00
Laurent Destailleur
8abde9e11f
Sec: Missing permission tests
2014-01-30 11:44:31 +01:00
Laurent Destailleur
8d916215cc
New: Add new hook function addMoreActionsButtons to allow a module to
...
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Maxime Kohlhaas
06bbc48399
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-01-21 09:03:25 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Maxime Kohlhaas
7e8a7f7e7f
Allow to clone an invoice on a different third
2014-01-17 15:44:06 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 09:43:21 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
eae92695d6
Fix: Warning into bank conciliation feature.
2014-01-09 18:47:33 +01:00
Maxime Kohlhaas
364085bd20
Fix : wrong var used in bank account class
2014-01-09 18:42:35 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
283297294b
Fix: Missing definition of status labels
2014-01-05 16:19:25 +01:00
Laurent Destailleur
f0503dfaa9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/compta/stats/cabyprodserv.php
htdocs/compta/stats/casoc.php
2014-01-03 18:28:00 +01:00
Laurent Destailleur
d992d5cb22
Fix: Bad SQL request when using filter on category.
2014-01-03 18:16:21 +01:00
Laurent Destailleur
49f3242796
Merge pull request #1357 from marcosgdf/payment_menu
...
Payment menu
2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
Marcos García de La Fuente
917ddf0dee
Payments and Supplier payment pages tabs can now be extended from modules.
2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Florian Henry
e971e4dfff
Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal
2013-12-23 11:05:14 +01:00
simnandez
d8644ec04c
Fix: Unable to make a withdrawal with two or more invocies
2013-12-23 10:47:35 +01:00
simnandez
11353786a1
Fix: Unable to make a withdrawal with two or more invocies
2013-12-23 10:46:19 +01:00
Laurent Destailleur
9e5e74cb58
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/fourn/commande/fiche.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/languages.lang
htdocs/langs/es_ES/main.lang
2013-12-19 21:03:15 +01:00
simnandez
03e2901070
Fix: Lost stats filters into year selection
2013-12-19 15:45:40 +01:00
simnandez
a1e0d84e37
Fix: Lost stats filters into year selection
2013-12-19 15:43:22 +01:00
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc1ccbfae8
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:40:43 +01:00
Laurent Destailleur
4248431dc9
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:35:13 +01:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -08:00
Laurent Destailleur
c94083b56e
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:33:44 +01:00
Alexis Algoud
4844aed67e
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-12-11 15:15:30 +01:00
Alexis Algoud
895f5452b4
In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted.
...
Ex in agefodd module:
$obj_link=new Propal($db);
$obj_link->id=$agf->propalid;
$resultdel=$obj_link->delete($user);
To prevent misuse of the function, the reference is not considered given
2013-12-11 15:14:29 +01:00
Laurent Destailleur
75703a03cc
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-10 21:48:22 +01:00
Raphaël Doursenaud
5ba9a1134b
Removed dead code
2013-12-10 11:38:02 +01:00
Laurent Destailleur
a89a4ee81a
Fix: Delete vat entry when bank line was already deleted.
2013-12-09 22:39:41 +01:00
Laurent Destailleur
a05d9b864a
Fix: Test must never be done on a translated string
2013-12-08 16:40:45 +01:00
Laurent Destailleur
b0e18348d9
Fix: Test must never be done on a translated string
2013-12-08 16:39:47 +01:00
Laurent Destailleur
533199c151
Fix: Missing translation and missing comments
2013-12-03 20:54:22 +01:00
Laurent Destailleur
01c91c7194
Fix: Missing translation and missing comments
2013-12-03 20:44:31 +01:00
Laurent Destailleur
6c26684284
Fix: [ bug #1166 ] Supplier account number in its card does not respect
...
order set in Banks module.
2013-12-01 23:17:16 +01:00
Laurent Destailleur
c475346248
Fix: [ bug #1166 ] Supplier account number in its card does not respect
...
order set in Banks module.
2013-12-01 23:16:18 +01:00
Laurent Destailleur
30428ec6e5
Fix: Control on minimum amount must be one only on standard and
...
replacement invoices.
Conflicts:
htdocs/compta/facture.php
2013-12-01 19:41:29 +01:00
Laurent Destailleur
a6e4ba7001
Fix: No limits for drafts lists
2013-12-01 19:40:36 +01:00
Laurent Destailleur
27c6b30651
Fix: Control on minimum amount must be one only on standard and
...
replacement invoices.
2013-12-01 18:56:20 +01:00
Laurent Destailleur
6e96d60c6c
Fix: No limits for drafts lists
2013-12-01 18:53:16 +01:00
Laurent Destailleur
5715e9c986
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-28 17:06:11 +01:00
Florian Henry
afc729c694
[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
2013-11-27 22:49:54 +01:00
Laurent Destailleur
6729f03ee6
Merge pull request #1323 from grandoc/3.5
...
fix language and standardize code
2013-11-26 07:28:30 -08:00
Laurent Destailleur
18ed9d5ca7
Fix: Filter on accountancy report were lost when using "print" view.
2013-11-25 16:51:30 +01:00
Grand Philippe
203a98d4ae
fix language and standardize code
2013-11-25 10:30:02 +01:00
Laurent Destailleur
f6f4f425af
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
2013-11-21 02:31:04 +01:00
Laurent Destailleur
9e9a386852
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/compta/facture.php
2013-11-21 02:19:21 +01:00
Laurent Destailleur
23f7de0873
Fix: [ bug #1094 ] Invoice Text Reminder
...
Conflicts:
htdocs/compta/facture.php
2013-11-21 02:07:13 +01:00
Laurent Destailleur
7871ccb9aa
Fix: [ bug #1094 ] Invoice Text Reminder
2013-11-21 02:02:31 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Raphaël Doursenaud
7945011955
Make AJAX new line form work again
...
FIXME: Factorize!
2013-11-19 17:54:36 +01:00
Laurent Destailleur
69f0d596ba
Fix: Pagination
2013-11-18 12:20:53 +01:00
Laurent Destailleur
48570f599a
Fix: form is not allowed into a table. This break some javascript and
...
make some browsers crazy.
2013-11-17 23:25:25 +01:00
Laurent Destailleur
8ec50fce23
Move warning at correct place.
...
Fix: Reset of amount was not working
2013-11-16 14:26:42 +01:00
Laurent Destailleur
5b243abe4b
Fix: Miscellaneous fixes
2013-11-16 12:00:08 +01:00
Laurent Destailleur
d0d9cce146
Fix: price should not be used to compare amounts. Price is a formated
...
string, not an amount.
2013-11-15 22:15:48 +01:00
simnandez
618bf4d75e
Remove td
2013-11-15 17:48:19 +01:00
simnandez
0aba9b02b8
Add alert for outstanding bill
2013-11-15 17:43:13 +01:00
aspangaro
e8c7bb9c62
Fix for language
2013-11-14 21:02:33 +01:00
Laurent Destailleur
4b3778d116
Merge pull request #1292 from aspangaro/3.4
...
fix for language
2013-11-09 16:08:19 -08:00
aspangaro
bb69fcf0d7
Fix for language
2013-11-09 07:00:59 +01:00
aspangaro
9170259351
fix for language
2013-11-09 06:51:10 +01:00
Laurent Destailleur
b2308ba65c
Merge pull request #1284 from GPCsolutions/links
...
Links
2013-11-06 17:15:49 -08:00
Laurent Destailleur
b82cbf1385
Fix: current balance was visible when it should not
...
Conflicts:
htdocs/compta/bank/account.php
2013-11-06 15:35:10 +01:00
Laurent Destailleur
521b3a89bf
Fix: current balance was visible when it should not
2013-11-06 15:31:56 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1
factorization
2013-11-06 10:20:54 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
190dabc3f7
Fix: Tons of bugs with extrafields feature.
2013-11-05 13:11:36 +01:00
Laurent Destailleur
2f47b0fcfd
Fix: picto for status8 is a flash red icon to report a critical error
...
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
2013-11-04 23:56:15 +01:00
Laurent Destailleur
5e246107a7
Doxygen
2013-11-04 16:31:12 +01:00
Laurent Destailleur
b2df689669
Merge pull request #1274 from FHenry/3.4
...
USe good status icon for thirdparty ActivityCeased
2013-11-03 13:18:37 -08:00
aspangaro
a9dd9d6dfc
Modify the presentation of the card
2013-11-03 15:07:26 +01:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Florian Henry
6aea0bf7a1
Fix [ bug #1105 ] Searching Boxes other search option
2013-11-02 12:49:37 +01:00
Laurent Destailleur
d8216a09e1
Fix: Try a fix to avoid error on big sql
2013-10-31 14:39:41 +01:00
Laurent Destailleur
c81bb60384
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Laurent Destailleur
197ae822d4
Merge pull request #1263 from FHenry/develop
...
Fix list propal and invoice to display customer ref if option is set
2013-10-26 17:13:07 -07:00
Florian Henry
17df92c654
Fix [ bug #1116 ] Silent Warning when validating a customer invoice
...
[PostgreSQL]
2013-10-26 16:01:02 +02:00
Laurent Destailleur
837d5f2e76
Qual: Normalize code of vat class
...
New: Can enter a vat payment of zero.
2013-10-25 19:27:38 +02:00
Florian Henry
bdcbd4ee42
Fix list propal and invoice to display customer ref if option is set
2013-10-22 12:47:26 +02:00
Laurent Destailleur
315e2e4c13
Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into
...
defrance69-patch-14
Conflicts:
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-10-20 14:12:56 +02:00
Laurent Destailleur
e5bc7d29d0
Fix: Validation of contract lose the new ref into trigger.
...
Fix: Validation of contract was not using transaction
Fix: Validation of contract did not renamed uploaded directory.
2013-10-18 10:17:06 +02:00
Laurent Destailleur
a8f784083c
Show ref with label on bank account.
2013-10-16 19:00:00 +02:00
Laurent Destailleur
07d04b7905
Fix: syntax error
2013-10-14 16:12:07 +02:00
Maxime Kohlhaas
0994184bf9
Fix invoice fetch on payment page
2013-10-14 09:45:32 +02:00
Maxime Kohlhaas
387e0ab50b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2013-10-14 09:42:10 +02:00
Laurent Destailleur
303cad162b
Qual: Show the rule name used to make calculation and link to change
...
rule.
2013-10-10 19:33:49 +02:00
Laurent Destailleur
383ead9234
Fix: remove a test output
2013-10-10 17:30:28 +02:00
Maxime Kohlhaas
d6da871381
Add object declaration on paiment
2013-10-10 09:31:37 +02:00
Laurent Destailleur
a11a0d6491
Fix: debug replanishment feature
2013-10-09 21:09:15 +02:00
Laurent Destailleur
47a9837046
Uniformize ref_customer into list
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
2013-10-07 21:58:12 +02:00
BENKE Charles
53531ff847
Update facture.php
2013-10-06 17:23:31 +02:00
BENKE Charles
ca0ba99eff
Update facture.php
2013-09-27 22:08:06 +02:00
BENKE Charles
fff1309cec
Update facture.php
2013-09-27 22:06:05 +02:00
Maxime Kohlhaas
4a20a29521
Add hook on paiementcard + fix hook on expedition
2013-09-27 11:00:25 +02:00
Maxime Kohlhaas
383e07d102
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2013-09-26 18:20:12 +02:00
Laurent Destailleur
3fde695c94
Qual: Uniformise name of include files we use to share common code found
...
into Actions area of pages (controllers).
2013-09-23 13:22:28 +02:00
Laurent Destailleur
5341811ec0
Fix: Clean awful code
2013-09-23 12:31:10 +02:00
Maxime Kohlhaas
00cb2aa26c
Fix : wrong var used in bank account class
2013-09-23 10:55:44 +02:00
Laurent Destailleur
b57ed72fc1
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +02:00
Laurent Destailleur
16396b985b
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-09-21 10:54:34 +02:00
Laurent Destailleur
b74f73c885
Fix: Calculation of deposit amount when using a percent was done only on
...
last line.
2013-09-21 10:53:46 +02:00
Laurent Destailleur
53979ad58c
Fix: Bad param
2013-09-20 14:29:09 +02:00
Laurent Destailleur
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Cédric Salvador
fc136d0d06
changed parameter
2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
a1e7333613
Fix: bug preventing creation of predefined invoice.
...
Also added phpunit test to detect it if it occurs again.
2013-09-16 13:42:42 +02:00
Laurent Destailleur
16e2de1d7b
Merge pull request #1228 from csalvador/develop
...
Added a field to group by to avoid error with mysql strict mode
2013-09-12 02:06:31 -07:00
simnandez
b36dc08e00
Remove unnecessary code
2013-09-12 09:59:23 +02:00
simnandez
c1c423dcac
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 17:49:36 +02:00
simnandez
634f70a74d
New: [ task #1060 ] Register fields localtax(1|2)_type into details
...
tables. Invoices
2013-09-10 17:07:38 +02:00
Cédric Salvador
13e86e9b0d
Added a field to group by to avoid error with mysql strict mode
2013-09-10 16:45:05 +02:00
Laurent Destailleur
72557437ef
Checkstyle
2013-09-10 14:19:36 +02:00
Cédric Salvador
0c93c6f0b1
format
2013-09-09 09:55:51 +02:00
Cédric Salvador
0d23f78e9f
indentation
2013-09-09 09:55:51 +02:00
Cédric Salvador
de1dec7c34
don't display warehouse selection if there's only one
...
Conflicts:
htdocs/compta/facture.php
htdocs/langs/en_US/stocks.lang
htdocs/langs/fr_FR/stocks.lang
2013-09-09 09:55:51 +02:00
Laurent Destailleur
74a50d8d6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-07 19:51:00 +02:00
Laurent Destailleur
082cf0b487
Revert "Avoid silly assignment"
...
This reverts commit fa51e310b8
2013-09-07 19:27:35 +02:00
Laurent Destailleur
305c1d63a7
Qual: Uniformize code. No useless redirect. use GETPOST.
2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828
Fixed typos
2013-09-05 18:06:51 +02:00
Raphaël Doursenaud
fa51e310b8
Avoid silly assignment
2013-09-05 17:19:30 +02:00
Laurent Destailleur
10c2bdc193
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Florian Henry
853758a422
REplicate extrafield value
...
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e
All deposit inoice form order
2013-08-30 10:46:05 +02:00
Laurent Destailleur
b39046ca7e
Fix: Add missing syslog
2013-08-28 13:05:14 +02:00
Laurent Destailleur
7f549e60f2
Fix: Bad selection of years into graphics
2013-08-27 12:02:33 +02:00
Laurent Destailleur
657c4d6e90
Fix: Fix graph for product distribution.
...
Add limit and add entry other.
2013-08-27 11:54:07 +02:00
Laurent Destailleur
67892575be
Merge pull request #1167 from PaulPoulain/999-develop
...
T999-develop: link invoice to a command
2013-08-25 03:23:57 -07:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
simnandez
fd759ade76
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:04:10 +02:00
simnandez
c242d66530
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:03:16 +02:00
lalaina rasamoelina
f913422e62
T999-develop: link invoice to a command
...
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
2013-08-22 10:17:03 +02:00
Christophe Battarel
dd32dbacb5
Fix retrieving of margin info when invoice created automatically from order (used by workflow module)
2013-08-21 18:55:11 +02:00
Christophe Battarel
29d329a1d2
ability to define margin rate on quotes, orders, invoices
...
more to come : same on edit, user permissions
2013-08-12 15:34:09 +02:00
Laurent Destailleur
59c1f54d68
New: Enhance DolGraph class for pie charts.
2013-08-09 19:19:48 +02:00
Laurent Destailleur
23516a466c
Fix: Pb with predefined invoices
2013-08-06 23:56:13 +02:00
Laurent Destailleur
7438809ab5
Make predefined invoice feature easier to use.
2013-08-06 23:55:17 +02:00
Laurent Destailleur
acf3db8512
Fix: Pb with predefined invoices
2013-08-06 23:50:12 +02:00
Laurent Destailleur
7a8d28f135
Several fix for last pull request:
...
- A property of an element must be shown under another element
- Property that may be page content must not be output into a list.
- Bad W3C (<br> must not be <br />)
- Must not use picto to edit a property to define a link to a page
(replaced with generic sheet picto).
2013-08-06 19:12:26 +02:00
Laurent Destailleur
7a17d52dad
Merge pull request #1157 from PaulPoulain/961-develop
...
T961-develop: Put the private note in the bill list
2013-08-06 09:44:28 -07:00
lalaina rasamoelina
a8ba4e1861
T961-develop: Put the private note in the bill list
...
In the invoice list, if there are the private notes,we print them and we can edit them
htdocs/compta/facture/liste.php
2013-08-06 16:36:16 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Laurent Destailleur
218e9f5b33
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-08-05 18:55:38 +02:00
Laurent Destailleur
2336a260d3
New: Add line "minimum amount desired into bank graph".
2013-08-05 18:54:03 +02:00
Laurent Destailleur
85572a4bd1
New: Start to work on box for product distributions
...
Qual: Start to move code of dol_print_graph function into class
DolGraph.
2013-08-05 17:19:49 +02:00
Maxime Kohlhaas
229c2d890f
Add possibility to define default VAT accountancy code for purchase
2013-08-02 10:43:53 +02:00
Laurent Destailleur
37592afa7e
New: Add hidden option BANK_DISABLE_DIRECT_INPUT
2013-07-31 18:40:09 +02:00
Laurent Destailleur
db8af86111
Fix: W3C
2013-07-30 18:36:13 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1
Fix: print of a function that already contains the print.
2013-07-27 14:10:57 +02:00
Laurent Destailleur
385d3612c5
Merge pull request #1136 from jfefe/extrarequired
...
Missing checks on extrafields
2013-07-27 03:09:44 -07:00
jfefe
bddbc6f6b2
Fix : show input fields if missing required extrafield when editing
...
invoice
2013-07-26 16:02:48 +02:00
Laurent Destailleur
5608e320f7
New: Can add a suffix into filename of template after -. This may be
...
used in future as specific criteria to filter list of numbering models
to show.
2013-07-26 15:10:56 +02:00
jfefe
371b40cc76
Do not create invoice if required extrafields are empty
2013-07-26 13:22:22 +02:00
Florian Henry
8721b7cfa7
Fix [ bug #1001 ] Charge sociale : état incorrect
2013-07-26 12:51:28 +02:00
Laurent Destailleur
de41e9e9c7
Qual: More responsive design
2013-07-26 12:45:31 +02:00
Laurent Destailleur
c4d3307bfa
Qual: Normalize file name.
2013-07-26 11:36:36 +02:00
Laurent Destailleur
55fc3165ba
New: Can filter on status
2013-07-26 11:27:56 +02:00
Laurent Destailleur
9c88c03860
Fix: missing css class on tr
2013-07-25 13:56:07 +02:00
Laurent Destailleur
bf9b255c92
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
BENKE Charles
0a1f483fd1
Update fiche.php
...
Add feature to change refnumber of bank bordereau
2013-07-21 10:10:49 +02:00
BENKE Charles
9f14ee8846
Update remisecheque.class.php
...
add change number of remisecheque feature with the real number of the bank
2013-07-21 10:08:58 +02:00
Geoffrey
27e26c872e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2013-07-19 17:33:29 +02:00
Laurent Destailleur
ad783cc4f1
Merge pull request #1112 from PaulPoulain/949-develop
...
949 Put the ref_client in the subject mail
2013-07-19 06:59:49 -07:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Laurent Destailleur
09fd904e76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/ecm/index.php
2013-07-19 14:01:47 +02:00
Maxime Kohlhaas
9d8438ecdd
Minor fix on remisecheque display
2013-07-19 13:39:01 +02:00
Laurent Destailleur
3896cde299
Removed useless method. Prefer using generic method.
2013-07-19 13:38:57 +02:00
Maxime Kohlhaas
196bce7e11
Add link to RemiseCheque in account lines
2013-07-19 10:23:08 +02:00
Maxime Kohlhaas
efff92fe1c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb
Start work on bank sharing for multi-company
2013-07-19 09:19:20 +02:00
Maxime Kohlhaas
4aa9d92a49
Display CheckReceipt on Payment card if exists
2013-07-19 09:17:54 +02:00
Maxime Kohlhaas
7abc53698a
Add RefExt field on RemiseCheque
2013-07-19 08:54:11 +02:00
Laurent Destailleur
75214a6b70
New: Add graphical box for turnover and proposal
2013-07-18 16:53:31 +02:00
Laurent Destailleur
d5ca2f9f40
Fix: forged select for stats where wrong when filtering on a thirdparty
...
Conflicts:
htdocs/compta/facture/class/facturestats.class.php
2013-07-18 15:37:14 +02:00
Laurent Destailleur
1b70ecdb26
Fix: forged select for stats where wrong when filtering on a thirdparty
2013-07-18 15:25:25 +02:00
lalaina rasamoelina
913f4d94cc
Put the ref_client in the subject mail
2013-07-18 12:39:50 +02:00
Juanjo Menent
8bae6a774d
Merge pull request #1095 from atm-maxime/develop
...
Fix on turnover reports
2013-07-16 23:47:56 -07:00
Laurent Destailleur
f564d1912e
New: Add graph for supplier invoices.
...
Fix: Error management into supplier invoice validation.
2013-07-16 18:43:38 +02:00
Maxime Kohlhaas
7b5386692c
Added w/o VAT on turnover report
2013-07-16 00:30:44 +02:00
Maxime Kohlhaas
bc0a52fa71
Fix : link to invoice list + SQL was bad when several invoices had the same amount on the same thirdparty
2013-07-16 00:29:03 +02:00
Laurent Destailleur
5fb707f918
Fix: Restore disappeared feature
2013-07-14 21:02:00 +02:00
Laurent Destailleur
446cc162cd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/compta/facture/impayees.php
2013-07-14 20:33:54 +02:00
Laurent Destailleur
dc5ad1a0f3
Fix: Total missing
2013-07-14 20:29:07 +02:00
Laurent Destailleur
0a3bd58645
Fix: Duplicate button
2013-07-14 03:28:19 +02:00
Laurent Destailleur
4608e07753
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/bank/account.php
2013-07-13 23:41:32 +02:00
Laurent Destailleur
3a9ffb19c3
fix: eol
2013-07-13 21:14:05 +02:00
Laurent Destailleur
73a33a6dae
Fix: Bug to delete bank line
2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35
Fix: Missing user param
2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f
Fix: Bug to delete bank line
2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235
Fix: Missing label
2013-07-13 17:25:10 +02:00
Laurent Destailleur
f009100126
Fix: Bad column
2013-07-12 16:51:31 +02:00
Laurent Destailleur
27a435994a
Qual: Some methods object->addline used a first parameter that was
...
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
1ee67bd5b9
Prepare code to uniformize method addline.
2013-07-10 16:07:57 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Laurent Destailleur
56676c925f
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-01 02:10:57 +02:00
Laurent Destailleur
59c97afeed
Fix: Bad calculation. Missing global.
2013-07-01 02:10:22 +02:00
Laurent Destailleur
c37527a8a0
Fix: No currency into lists.
2013-07-01 01:59:07 +02:00
Laurent Destailleur
d8883dba7f
New: Add new graphical boxes (customer invoices per month).
2013-06-28 19:19:18 +02:00
Florian Henry
1580f92b11
Fix bug for PGSQL Migration 3.4->3.5
...
Fix bug on create invoice from contract
2013-06-27 08:09:28 +02:00
Maxime Kohlhaas
76870622e4
Add turnover report by product / serv
2013-06-25 14:54:29 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Maxime Kohlhaas
0d3b7f1a0f
merge
2013-06-24 10:01:23 +02:00
Laurent Destailleur
b49a1168e3
Fix: Use div for tables when there is a different form on each line.
2013-06-23 18:33:03 +02:00
Laurent Destailleur
1d2f09688e
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064
Fix: Css for fieldset
2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-23 13:04:00 +02:00
Laurent Destailleur
e5eb5492e9
Fix: W3C
2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6
Fix: Search filter was lost
2013-06-23 13:00:02 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Marcos García
4532399026
CR Fix
...
I'm getting tired of these commits...
2013-06-19 09:26:20 +02:00
Laurent Destailleur
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Florian Henry
f2e2815cc1
Merge branch 'develop' into dev_projecthtmlform
2013-06-15 11:56:45 +02:00
Florian Henry
8fb2b8fa12
Start normalize project module : create html.formprojet.class.php with
...
selec_project
2013-06-14 22:33:01 +02:00
simnandez
684c086ad0
Fix: param must be a string
2013-06-14 15:37:28 +02:00
Laurent Destailleur
499440be16
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-14 01:29:43 +02:00
Florian Henry
1ecc24216f
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:07:50 +02:00
Florian Henry
fb0a99cb55
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:05:19 +02:00
Laurent Destailleur
0c9bc2ac5f
Merge branch 'develop' of https://github.com/frederic34/dolibarr into
...
frederic34-develop
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
2013-06-12 10:47:56 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Marcos García
cf6bfcc9c4
Missing translations
2013-06-08 20:31:39 +02:00
Marcos García
3cff899b44
Removed debug message and wrong translation key
2013-06-08 20:01:51 +02:00
Marcos García
532c56002d
Entities problem with error message in predefined invoice creation
2013-06-08 19:07:13 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
simnandez
26b36f3a4e
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:10:31 +02:00
simnandez
097fbaacd0
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:09:30 +02:00
simnandez
a4841dacda
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:09:13 +02:00
Laurent Destailleur
4133bfc3a4
Fix: Ton of bugs into bank categ editor (W3C, update error, syntax
...
error...)
2013-05-31 11:15:13 +02:00
Florian Henry
7c56da05b8
Add hook on propal/order/incoive list
2013-05-28 18:35:15 +02:00
simnandez
8d9b1e4788
Fix: Show date formatted
2013-05-22 10:51:45 +02:00
Laurent Destailleur
12681994ea
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/fichinter/class/fichinter.class.php
htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
Laurent Destailleur
6db07ac2d8
Fix: Several bugs into filter on statistics pages.
2013-05-20 19:24:27 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
fhenry
fefb21a56e
Fix bug on Extrafield checkbox
...
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
fhenry
e19e9e1c63
Add dol_syslog
2013-05-17 21:27:15 +02:00
Laurent Destailleur
bbb843ec58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-15 19:30:57 +02:00
Laurent Destailleur
85eac29925
New: Add balance before and after column
2013-05-15 19:30:32 +02:00
simnandez
2981d4a1ec
Fix: Remove windows CR/LF
2013-05-15 18:14:37 +02:00
Laurent Destailleur
3a11e0baad
New: Script export-bank-receipts should be ready for test.
2013-05-14 23:59:59 +02:00
Laurent Destailleur
d92b46c9f9
Fix: Label missing
...
Fix: Cancel not working
2013-05-14 23:41:57 +02:00
Laurent Destailleur
fe9e8aab5e
Fix: Label missing
...
Fix: Cancel not working
2013-05-14 23:39:17 +02:00
Laurent Destailleur
d7e9236455
Fix: Missing include
2013-05-14 01:31:04 +02:00
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Laurent Destailleur
559bbdf19a
Merge pull request #944 from defrance69/patch-8
...
Update annuel.php
2013-05-13 15:40:43 -07:00
Laurent Destailleur
273fbdfa0e
Merge pull request #942 from FHenry/3.4
...
Remove warning if FetchObjectLinked call
2013-05-13 15:38:28 -07:00
simnandez
0c853b3ebd
Fix: Some bugs on withdrawal rejects
2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee
Fix: Some bugs on withdrawal rejects
2013-05-13 17:15:23 +02:00
simnandez
050ca946e9
Fix: Debug of withdrawals rejects
2013-05-13 16:30:52 +02:00
Laurent Destailleur
2c05d99742
Qual: Uniformize code
2013-05-12 20:10:16 +02:00
simnandez
dbb0fa09ff
Fix: Debug of withdrawals rejects
2013-05-11 18:36:44 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
BENKE Charles
ea130724b1
Update annuel.php
...
Add Debt and Cred graphic at the bottom of the page
2013-05-10 23:16:41 +02:00
simnandez
d228005e17
Fix: Remove windows CR/LF
2013-05-10 17:43:55 +02:00
fhenry
8542a4fd28
Fix date extrafield message old datetimeformat use message in log
2013-05-10 16:34:14 +02:00
Laurent Destailleur
d1d9a65de5
Merge pull request #940 from aponzio/develop
...
Fixed odd translation
2013-05-10 07:31:44 -07:00
Alessandro Ponzio
0817d035a3
Updated SQL query that fetches invoices by adding the 'ORDER BY' clause
2013-05-10 14:38:15 +02:00
simnandez
bf043fc845
Fix: Remove windows CR/LF
2013-05-08 09:28:05 +02:00
fhenry
37a9686921
Fix bug [ bug #884 ] Warnings on /compta/bank/index.php
2013-05-07 17:06:10 +02:00
fhenry
de4b9b01bf
Fix Bug [ bug #880 ] Prelevement section is broken
2013-05-07 15:34:40 +02:00
Marcos García
44ef25a367
Converted recent changes to UTF-8 encoding
2013-05-06 18:10:41 +02:00
BENKE Charles
5c766d255f
Update categ.php
...
Add update label feature
2013-05-03 16:02:04 +03:00
Laurent Destailleur
7382a97223
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2013-05-03 10:13:31 +02:00
Marcos García
c65620ab62
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866
...
Conflicts:
ChangeLog
2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f
Enhanced fix
2013-05-03 08:16:31 +02:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
fhenry
0dbc73a6cc
Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d
2013-05-02 22:57:42 +02:00
Marcos García
97478ccbf2
Error statut image + not translated strings
2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171
Corrected some es_ES translations and fixed problems with translations not being translated
2013-05-01 20:43:08 +02:00
Marcos García
a9e63610ae
Fixed bug #866 : Standing order from an invoice suggests invoice total amount instead of remaining to pay
2013-05-01 20:40:29 +02:00
Laurent Destailleur
5b85adfb90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/bank/account.php
2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d
Fix: Links when transaction is withdraw has disappeared.
2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b
Fix: Links when transaction is withdraw has disappeared.
2013-05-01 02:28:14 +02:00
Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Laurent Destailleur
e29f533b7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce
Uniformize code for liste_array
...
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
Marcos García
7a115a9216
Expedition class name was not being translated when creating invoice from it
2013-04-27 13:55:20 +02:00
fhenry
b67faf1eb1
Fix PgSQL
2013-04-26 13:01:42 +02:00
fhenry
b9f7d4c302
Fix bug on invoice extrafield type date
2013-04-26 12:20:15 +02:00
fhenry
a06581771c
Reveiw extrafield for womplaiance with wiki
...
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
