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
