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 |
|
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
|
6cb3199824
|
Translation message
|
2017-02-06 12:03:20 +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
|
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
|
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
|
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 |
|
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
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +01:00 |
|
Laurent Destailleur
|
2f4ff66c43
|
Minor fixes
|
2017-01-20 14:10:57 +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 |
|
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
|
d14e4dbaba
|
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
|
2017-01-15 20:49:20 +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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
63d0622790
|
Fix phpcs
|
2016-11-24 19:48:28 +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 |
|
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 |
|