lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,194 Commits 43 Branches 150 Tags 886 MiB
caecb0152f
Commit Graph

9567 Commits

Author SHA1 Message Date
Laurent Destailleur
1a167aa5b4 Update card.php 
Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 15:12:55 +01:00
atm-lena
ecea726323 FIX CA by prod list filter 2020-02-07 15:01:37 +01:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
f3e27695e2 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:50 +01:00
Laurent Destailleur
af7a5b510d Fix phpcs 2020-02-04 14:47:30 +01:00
Laurent Destailleur
a30da7860f FIX #12892 2020-02-03 03:32:31 +01:00
Michael Jeanmotte
f1f83656f1 Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259 2020-01-29 22:54:35 +01:00
Laurent Destailleur
60f772d285 FIX Pending amount to pay must be zero if invoice close for anticipated 
payment.
 2020-01-29 17:56:09 +01:00
oscim
d224c711cf Update result.php 
fix error for display detail of account 6xxx. this account is < 0, but is not null
 2020-01-29 11:07:30 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:51:32 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices 
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
 2020-01-27 09:49:49 +01:00
Laurent Destailleur
7438f92912 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/compta/tva/document.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/card.php
 2020-01-27 01:50:02 +01:00
Laurent Destailleur
cf6b9f7d03
Merge pull request #12918 from atm-florian/11_fixWithdrwLineList 
fix SEPA lines with limit select and working pagination
 2020-01-26 22:25:01 +01:00
Laurent Destailleur
14f1f98b59
Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination 
10 fix create sepa limit and pagination
 2020-01-26 22:24:11 +01:00
Pierre Ardoin
c64acb1a9c
Permissions Issue 
fixes an issue that displayed the "restricted area" banner despite user permissions.
 2020-01-25 15:19:46 +01:00
Laurent Destailleur
f2771b3365 FIX #12896 2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
209ebfbe2f Fix trans 2020-01-24 16:14:52 +01:00
Laurent Destailleur
923e315dae Debug cashfence feature 2020-01-24 15:59:36 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
florian HENRY
2f0144b19b Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11_fixWithdrwLineList 2020-01-24 13:22:24 +01:00
florian HENRY
dc3eafccb9 add hook into withdraw list 2020-01-24 13:22:04 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 21:03:15 +01:00
Laurent Destailleur
e1123c63a9 Fix field label 2020-01-23 19:42:00 +01:00
Laurent Destailleur
b74d37338b Fix trans 2020-01-23 19:37:34 +01:00
Laurent Destailleur
a44d534e64 Fix label 2020-01-23 19:32:34 +01:00
Laurent Destailleur
423be8a139 FIX Label of status of social contribution 2020-01-23 19:30:02 +01:00
florian HENRY
62caf3cbfc fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:59:50 +01:00
florian HENRY
5ad5578f40 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:45:16 +01:00
florian HENRY
fd0daad959 fix SEPA line with limit select and working pagination 2020-01-23 16:49:06 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
dc1600b3c2 Fix responsive 2020-01-21 10:54:31 +01:00
Laurent Destailleur
2d07a08e55 Fix init of specimen 2020-01-21 00:22:57 +01:00
Laurent Destailleur
5f64531e9b Fix look and feel v11 2020-01-20 12:39:25 +01:00
Laurent Destailleur
b8938b8d19 Fix look and feel v11 2020-01-20 02:18:00 +01:00
Laurent Destailleur
62b9fbb67f Fix link 2020-01-19 20:33:55 +01:00
Laurent Destailleur
5a702eb50c Fix filter on amount 2020-01-19 19:55:57 +01:00
Laurent Destailleur
99f679493b Fix search 2020-01-19 19:51:40 +01:00
Laurent Destailleur
19ab802aaf Fix disabling of balance 2020-01-19 19:48:19 +01:00
Laurent Destailleur
d6bdbccf4f Fix link 2020-01-19 19:33:57 +01:00
Pierre Ardoin
e4eb8883fe
Fix double display of create credit note button 
Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated.
After: Displays a single button "Create a credit note"
 2020-01-19 19:10:10 +01:00
Laurent Destailleur
8c8d492a48 FIX Protection to avoid blocking situation with negative lines 2020-01-19 15:19:07 +01:00
Laurent Destailleur
82deccea08 Fix bad link 2020-01-17 14:41:42 +01:00
Laurent Destailleur
fe6bcd8a31 Fix missing value in popup 2020-01-17 14:32:22 +01:00
Laurent Destailleur
76e7c147b3 Look and feel v11 2020-01-16 18:03:57 +01:00
Laurent Destailleur
849c78f4cd Doc 2020-01-16 10:12:39 +01:00
Laurent Destailleur
ad7278e6a5 FIX Label of DEPOSIT on screen 
Fix look and feel v11
 2020-01-16 02:48:24 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
Laurent Destailleur
9ebdd82edb Fix We must refuse to delete a various payment if payment was dispatched 
in accountancy.
 2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f Fix sql error on update of subledger account on a various payment 
Fix warning message that was not accurate
 2020-01-10 02:20:08 +01:00
atm-arnaud
ae4554af65 FIX drafts are now implemented for stats 2020-01-08 11:27:52 +01:00
Laurent Destailleur
ec2ea612ae Fix GETPOST 2020-01-06 17:19:49 +01:00
Laurent Destailleur
58ff3e563d Fix link a href 2020-01-06 02:21:42 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Alexandre SPANGARO
f14aaf5e50 FIX Some problems on conciliation with others modules 2020-01-03 16:35:02 +01:00
Laurent Destailleur
2c20b25a29 Suggest another value than "bad customer" to close an invoice paid 2020-01-02 18:02:53 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
Laurent Destailleur
b50cb2a65d Fix solution to solve a blocking situation (credit note both refunded 
and consumed)
 2020-01-01 19:04:14 +01:00
Laurent Destailleur
175894db26 FIX Status of direct debit payment after setting to paid. 2019-12-31 14:48:52 +01:00
Laurent Destailleur
8202a67e4e Fix look and feel v11 2019-12-25 23:15:56 +01:00
Alexandre SPANGARO
44400b7866 FIX : Some issues on salary payment 2019-12-24 07:22:25 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
VESSILLER
c39e45b81a FIX set due date in object in create invoice 2019-12-23 10:57:51 +01:00
Laurent Destailleur
daae053e39 Debug CashFence feature 2019-12-22 20:02:18 +01:00
Laurent Destailleur
3036ff637f Fix bad url 2019-12-22 19:49:39 +01:00
Laurent Destailleur
3ae5901a64 Fix look and feel v11 2019-12-22 19:46:36 +01:00
Laurent Destailleur
dd9f25b13a CSS 2019-12-22 16:33:15 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
d9a1e1b348 Fix several non dolibarr behaviour on input of salary payments 2019-12-19 10:01:11 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90 Fix creation/update of expense reports 
Fix export of accounting documents
 2019-12-18 23:07:26 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
138215fc3f Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non 
european users.
 2019-12-16 22:30:16 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
49a8b4544e Fix look and feel v11 2019-12-15 19:32:37 +01:00
Laurent Destailleur
9685b56375 Fix warning 2019-12-15 15:03:22 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
8fbaae3fef
Merge pull request #12694 from frederic34/patch-8 
doxygen
 2019-12-14 13:43:47 +01:00
Regis Houssin
a527e72124 FIX #12688 2019-12-12 16:35:07 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen 2019-12-12 08:17:14 +01:00
Frédéric FRANCE
269e53583d
doxygen 2019-12-11 23:46:12 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
c98ab917dd
doxygen 2019-12-11 20:33:58 +01:00
Laurent Destailleur
5454380834 CSS 2019-12-11 19:14:41 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
738526e77e Fix br 2019-12-10 14:04:50 +01:00
Laurent Destailleur
fe44d3a4fa FIX #12674 2019-12-10 14:02:03 +01:00
Laurent Destailleur
2d97c0bb79 Try better fix for #12674 2019-12-10 13:55:45 +01:00
Laurent Destailleur
a77dc75bd4
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template 2019-12-09 16:05:23 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card 
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
 2019-12-09 15:59:55 +01:00
Laurent Destailleur
f28e4c14e8 FIX #12644 2019-12-09 13:40:26 +01:00
Laurent Destailleur
0a3b2987d1
Merge pull request #12657 from frederic34/patch-19 
doxygen
 2019-12-09 10:47:16 +01:00
Laurent Destailleur
eb0d20b77e Fix label of country 
Fix div empty
 2019-12-09 09:16:59 +01:00
Frédéric FRANCE
c05ba624ce
Update deplacement.class.php 2019-12-08 22:46:22 +01:00
Frédéric FRANCE
3db84df60e
Update card.php 2019-12-08 22:45:10 +01:00
Frédéric FRANCE
6c5629b5a5
Update deplacement.class.php 2019-12-08 22:39:33 +01:00