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
