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

9342 Commits

Author SHA1 Message Date
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
atm-ph
f14f1c9190 Fix wrong placement to print title and missing hook to print value 2019-08-23 09:15:15 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
 2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
 2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55 FIX name and position of hook FIX #11710 2019-08-22 12:30:14 +02:00
Laurent Destailleur
54203dda1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2019-08-21 16:25:48 +02:00
Laurent Destailleur
def0311f9d Fix translation 2019-08-19 17:26:13 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
Laurent Destailleur
6abfd8b145 Fix use short labels for workboard 2019-08-19 10:01:42 +02:00
Laurent Destailleur
71be9f5b3f Fix test on terminal for 'cashdesk' module 2019-08-18 21:01:17 +02:00
Laurent Destailleur
c989a63360 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/langs/en_US/cashdesk.lang
 2019-08-18 20:54:06 +02:00
Laurent Destailleur
783e01588c FIX It was possible to create cashfence without entering data. 2019-08-18 20:47:40 +02:00
andreubisquerra
bbc1dfb0f7 Cashcontrol TakePOS fixes 2019-08-18 20:40:31 +02:00
Laurent Destailleur
f39e8ef835
Merge pull request #11703 from andreubisquerra/master 
Cashcontrol TakePOS fixes
 2019-08-18 20:39:57 +02:00
Laurent Destailleur
f27bea9497 Fix phpcs 2019-08-18 20:39:02 +02:00
Laurent Destailleur
ad5f2dbe9d Fix update on id 2019-08-18 18:56:58 +02:00
Laurent Destailleur
8cf0671804 FIX Missing transaction 2019-08-18 18:56:21 +02:00
andreubisquerra
063f19fe67 Cashcontrol TakePOS fixes 2019-08-18 09:33:02 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Jean Traullé
e0310b5d9b
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries 2019-08-16 11:38:42 +02:00
Laurent Destailleur
6430c74793
Merge pull request #11168 from hregis/develop_menu 
NEW add new function "setEntity()" and better compatibility with Multicompany
 2019-08-15 21:00:05 +02:00
Laurent Destailleur
c1d54a7711
Merge pull request #11652 from prietojc/patch-6 
FIX: Update() in charge sociales
 2019-08-15 19:35:27 +02:00
Laurent Destailleur
4a083bb038
Update chargesociales.class.php 2019-08-15 19:35:05 +02:00
Jean Traullé
6edf5494c3
Added @throws annotations for possible exceptions 2019-08-15 15:29:37 +02:00
Jean Traullé
f37b8c78c8
NEW Add POST /bankaccounts/transfer REST API endpoint. 
This allow internal transfers between two bankaccounts.
 2019-08-15 15:18:09 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
JC Prieto
d00f3c9685
Update chargesociales.class.php 2019-08-12 20:07:24 +02:00
JC Prieto
0e9898041e
Setting NULL if not project 2019-08-12 09:45:47 +02:00
Laurent Destailleur
14fabeb377 Variable rangtouse -> ranktouse 2019-08-10 00:46:20 +02:00
Frédéric FRANCE
aa462bac23
Add empty index.html 2019-08-09 09:25:48 +02:00
JC Prieto
faf65f39b6
FIX: Update() function checking 
If module Project is off, shows an error.
 2019-08-06 19:14:56 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
6693f9fbca Fix phpcs 2019-08-01 16:24:19 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Regis Houssin
d9ea61e47c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop_menu

Conflicts:
	htdocs/commande/class/commande.class.php
 2019-07-31 12:49:56 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
dca775985f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:41 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
5cbde99871
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum 
NEW Can edit date or RUM mandate
 2019-07-30 16:04:57 +02:00
ptibogxiv
5b1a89bf94 Fix php error with const 2019-07-30 15:42:37 +02:00
ptibogxiv
5880d549fb
Fix php error with const 2019-07-30 11:55:46 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Maxime Kohlhaas
3cc2c91e31 Use date_rum if defined 2019-07-28 22:26:19 +02:00
atm-quentin
f7c739bba9 FIX wrong path sociales/index.php doesnt exist anymore 2019-07-26 12:12:08 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
2dc2af7c41
Merge pull request #11552 from aspangaro/10.0_FEC 
Presentation nowrap on amount
 2019-07-25 17:35:36 +02:00
Alexandre SPANGARO
3921f706e2 Presentation nowrap on amount 2019-07-24 09:01:11 +02:00
Laurent Destailleur
8aaa716e33 Fix missing title 2019-07-23 13:05:33 +02:00
Laurent Destailleur
a61fdc5a3c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-23 00:25:10 +02:00
Laurent Destailleur
a33ac665bb Fix phpcs 2019-07-22 22:07:04 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
4833c2bf49 Merge 2019-07-22 18:50:17 +02:00
Laurent Destailleur
f5afc50067 Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries 2019-07-22 18:47:35 +02:00
Laurent Destailleur
a379d7804c
Merge pull request #11535 from aspangaro/11.0_p1 
QUAL Move ligne.php to line.php
 2019-07-22 18:33:06 +02:00
Laurent Destailleur
cf87196f37 Fix css 2019-07-21 20:55:12 +02:00
Laurent Destailleur
d6d1b29257 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-21 16:15:32 +02:00
Laurent Destailleur
4f34a8b6e8 FIX Position was lost when we edit the line of template invoice 2019-07-21 16:15:13 +02:00
Laurent Destailleur
f368ef377b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-07-20 16:02:15 +02:00
Laurent Destailleur
f6c937a218 Fix translation 2019-07-20 14:14:18 +02:00
Laurent Destailleur
0dcd38b96f Fix decimals 2019-07-20 14:09:42 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Alexandre SPANGARO
5f042cf6ad QUAL Move ligne.php to line.php 2019-07-19 23:19:06 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
e5c3945ec3 FIX delete of links between objects 2019-07-19 18:10:45 +02:00
Laurent Destailleur
14751680d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-19 13:38:05 +02:00
Laurent Destailleur
2e08c02510 Better error management 2019-07-19 13:37:28 +02:00
Laurent Destailleur
f745d01bf3 Prepare change of properties "titre" into "title" 2019-07-19 13:22:54 +02:00
atm-ph
a03bb00254 Fix missing hook 2019-07-19 11:26:21 +02:00
Regis Houssin
cbda42d146 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-07-19 09:37:34 +02:00
Laurent Destailleur
e5801c0b68
Update bonprelevement.class.php 2019-07-19 04:06:22 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
atm-ph
fcd95ce073 Fix missing trigger call 2019-07-18 18:07:17 +02:00
Laurent Destailleur
b3182f65bc
Update create.php 2019-07-18 17:23:52 +02:00
Laurent Destailleur
e548872133
Update prelevement.php 2019-07-18 17:23:05 +02:00
atm-ph
984fe98342 Fix missing hook 2019-07-18 16:12:42 +02:00
atm-ph
c961a397c4 Fix missing hook then can't interact with actions 2019-07-18 15:40:50 +02:00
Laurent Destailleur
2c0c5a505f
Merge pull request #11351 from rycks/tvaPrint 
Update print VAT document: remove form part and add right title
 2019-07-16 17:18:07 +03:00
Laurent Destailleur
b9771db131
Fix phpcs 2019-07-16 17:16:49 +03:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85 Fix save of doc template for recuring invoices. 2019-07-14 00:10:15 +02:00
Laurent Destailleur
39e77dbdc6
Merge pull request #11461 from ATM-Nicolas/fix_template_invoice_edit_modelpdf 
FIX : We must save code instead of value in database…
 2019-07-14 00:19:13 +03:00
Laurent Destailleur
b6571d9fc3
Update byratecountry.php 2019-07-13 22:39:25 +02:00
gauthier
cce8f98afc FIX : accounting mode must be taken from global conf, because there's no way to choose a mode with interface 2019-07-10 16:33:03 +02:00
Maxime Kohlhaas
0aa42fefae Fix : use RUM if defined in bank account 2019-07-09 18:13:11 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
675b7b2e32 Fix link to reconcile 2019-07-05 13:11:30 +02:00
Laurent Destailleur
575dce2dff Fix css 2019-07-05 12:17:36 +02:00
ATM-Nicolas
3d076d8bf9 FIX : We must save code instead of value in database for template invoice modelpdf 2019-07-05 11:16:12 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
69e0353e12 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-04 12:26:26 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/action/card.php
 2019-07-04 12:22:40 +02:00
Laurent Destailleur
bc309ace38 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:16 +02:00
Louis Sautier
818a8c7d59
Fix missing form end tag in prelevement 2019-07-03 10:46:32 +02:00
Alexandre SPANGARO
ab7cb7bb2e FIX Nowrap on amount 2019-07-02 12:01:50 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
John Botella
9c2e83dcae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-07-01 09:51:26 +02:00
Laurent Destailleur
8919eaebab Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 23:27:15 +02:00
Laurent Destailleur
2cefe638ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/prelevement/factures.php
 2019-06-29 23:24:04 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
John Botella
75b55ac5d6 fix travis recommendations 2019-06-28 16:10:41 +02:00
Laurent Destailleur
854bbf8405 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-28 14:09:00 +02:00
Laurent Destailleur
c0ba22fc6c
Merge pull request #11406 from ptibogxiv/patch-194 
NEW Can load multilang translation in same step than fetch_lines
 2019-06-28 14:04:06 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
6136dd6e7c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-27 13:57:08 +02:00
Laurent Destailleur
8c6485fa20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	ChangeLog
	htdocs/compta/facture/card.php
 2019-06-27 13:56:33 +02:00
Laurent Destailleur
d69b20311b FIX If the replacement invoice has been deleted we can reopen 2019-06-27 01:13:46 +02:00
Laurent Destailleur
be695a8e1a Fix link for situations 2019-06-27 00:51:03 +02:00
John Botella
ee98f3e6d7 fix travis recommendations 2019-06-26 10:48:22 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +02:00
ptibogxiv
c81ffcd8f0
Update facture.class.php 2019-06-25 18:14:56 +02:00
ptibogxiv
66eec4da52
Update facture.class.php 2019-06-25 15:46:12 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
d810e11c4e
Update fiche-rec.php 2019-06-24 19:23:32 +02:00
John Botella
ec7446762c Fix travis 2019-06-24 14:36:06 +02:00
Laurent Destailleur
1daac232b0 Code comment 2019-06-24 14:31:58 +02:00
John Botella
a83e7f3665 Add retained warranty to PDF 2019-06-24 12:00:55 +02:00
John Botella
7b6925b8f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-24 10:29:43 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
 2019-06-20 18:24:43 +02:00
Laurent Destailleur
d47cf87c00 Look and feel v10 2019-06-20 17:59:28 +02:00
Laurent Destailleur
c521b9b8f8 Fix dispatch in ledger table of withdraw / direct debit payment 2019-06-20 16:58:51 +02:00
Laurent Destailleur
4f9aa4caac Fix phpcs 2019-06-20 13:53:31 +02:00
Laurent Destailleur
4ffa48d9bd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 13:50:47 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
Laurent Destailleur
d15a300f02 Removed not used var 2019-06-20 04:10:58 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook 2019-06-20 03:04:32 +02:00
Laurent Destailleur
925314c710
Merge pull request #11367 from aspangaro/10.0_other3 
Nowrap on amount
 2019-06-20 02:51:14 +02:00
Laurent Destailleur
e060af5c97
Update treso.php 2019-06-20 02:50:23 +02:00
Laurent Destailleur
daa8b43732 css 2019-06-19 15:51:48 +02:00
Laurent Destailleur
a11c816a17 Fix tooltip 2019-06-19 14:24:48 +02:00
Alexandre SPANGARO
9a32117b1d Nowrap on amount 2019-06-19 08:43:57 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
Alexandre SPANGARO
a849fbe42e Nowrap on amount 2019-06-19 07:15:52 +02:00
Laurent Destailleur
f3703c8805 Fix phpcs 2019-06-18 18:07:47 +02:00
Laurent Destailleur
2e1eb29ca0 Fix rendering of amount 2019-06-18 17:43:08 +02:00
Laurent Destailleur
27f52dd0bd Fix columns in csv 2019-06-18 14:32:35 +02:00
Laurent Destailleur
ad20a5158c Fix columns in csv 2019-06-18 14:32:28 +02:00
Laurent Destailleur
8835b49f3f Debug the accounting-file tool 2019-06-18 14:30:13 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Eric Seigne
0b3bc5a172 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber 2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287 Debug page to export file 2019-06-17 17:20:22 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Eric Seigne
71d984483d Update print VAT document: remove form part and add right title 2019-06-17 14:45:49 +02:00
Regis Houssin
6597c9f60d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-17 06:45:08 +02:00
Laurent Destailleur
a7e0589071 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:22 +02:00
Laurent Destailleur
c57013f293 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:14 +02:00
Laurent Destailleur
3ad36a51db
Merge pull request #11312 from aspangaro/10.0_b1 
Look and feel v10
 2019-06-12 13:11:27 +02:00
Laurent Destailleur
475f59cc2a
Update annuel.php 2019-06-12 13:10:17 +02:00
Laurent Destailleur
9d95812495
Update bankentries_list.php 2019-06-12 13:08:26 +02:00
Laurent Destailleur
509ca489b2
Update card.php 2019-06-12 13:06:02 +02:00
Alexandre SPANGARO
eb4dc36e05 Responsive on invoice index 2019-06-12 04:56:16 +02:00
Alexandre SPANGARO
f3cba86282 Better look 2019-06-10 07:49:10 +02:00
Alexandre SPANGARO
6d43efb4a2 Align right 2019-06-09 16:35:45 +02:00
Alexandre SPANGARO
8c5a01dd90 Show total with decimals 2019-06-09 08:56:49 +02:00
Alexandre SPANGARO
33b02b97d5 Better look 2019-06-09 08:50:20 +02:00
Alexandre SPANGARO
ae686ff62a Better look 2019-06-09 08:39:38 +02:00
Laurent Destailleur
1b77d2f10b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 22:56:58 +02:00
Laurent Destailleur
f713deb0a8 Fix sql syntax error 2019-06-07 22:55:51 +02:00
Laurent Destailleur
0099c1f602 Fix missing date 2019-06-07 22:55:18 +02:00
Laurent Destailleur
49646663a1 Fix link on invoice 2019-06-07 22:47:15 +02:00
Laurent Destailleur
e3812e3b0c FIX source template invoice not loaded/shown 2019-06-05 08:20:10 +02:00
Laurent Destailleur
c200ec22da Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-06-05 08:17:28 +02:00
Laurent Destailleur
5451d72900 FIX source template invoice not loaded/shown 2019-06-05 08:08:31 +02:00
Laurent Destailleur
4a63c6d38a Fix phpcs 2019-06-04 19:20:08 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
John BOTELLA
d7a393bbd3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-04 14:00:18 +02:00
Laurent Destailleur
969e139d5c Fix parameters of accessforbidden 2019-06-04 12:21:27 +02:00
Laurent Destailleur
2c04a480a2 Fix phpcs 2019-06-04 02:31:19 +02:00
Laurent Destailleur
ba2b07917b Fix look and feel v10 2019-06-04 02:11:03 +02:00
Regis Houssin
fc83585574 FIX use setEntity() to move code in multicompany module 2019-06-03 11:37:04 +02:00
Regis Houssin
7b8b1a9052 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-03 11:04:28 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
a1a9313487
Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2 
Fix : only invoice active lines of a contract
 2019-06-02 12:29:13 +02:00
Laurent Destailleur
4bbef9b478
Update card.php 2019-06-02 12:29:05 +02:00
Laurent Destailleur
7020e1ef29
Update card.php 2019-06-02 12:27:32 +02:00
Maxime Kohlhaas
916d3ce931 Fix : only invoice active lines of a contract 2019-06-02 11:00:58 +02:00
Maxime Kohlhaas
6dd01e86e9 Fix : avoid warning and uniformize var use 2019-05-31 15:53:23 +02:00
Laurent Destailleur
03feb3604c
Merge pull request #11265 from frederic34/patch-2 
Update tpl linked invoices
 2019-05-29 13:54:09 +02:00
Laurent Destailleur
bc030561ac Debug various payment 2019-05-29 13:48:00 +02:00
Laurent Destailleur
280a034199 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-29 13:15:57 +02:00
Laurent Destailleur
a7dccf1617
Merge pull request #11255 from aspangaro/10.0_accountancy2 
FIX Lost functionnality - Add category to bank transaction with various payment
 2019-05-29 13:15:47 +02:00
Laurent Destailleur
cafb3840b7 Fix look and feel v10 2019-05-29 12:56:11 +02:00
Laurent Destailleur
6a84dfe29e
Update card.php 2019-05-29 12:34:54 +02:00
Frédéric FRANCE
6bb1a4a0e6
Update linkedobjectblock.tpl.php 2019-05-29 11:26:04 +02:00
Frédéric FRANCE
c5c7e8d451
Update linkedobjectblock.tpl.php 2019-05-29 11:18:01 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
848b8f9bc4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/cron/cron_run_jobs.php
	htdocs/public/payment/newpayment.php
	scripts/cron/cron_run_jobs.php
 2019-05-27 19:01:28 +02:00
Laurent Destailleur
71da27f333 Add error message 2019-05-27 16:40:06 +02:00
Alexandre SPANGARO
19b275f2d1 Fix bankline cat with various payment 2019-05-26 22:33:35 +02:00
Laurent Destailleur
b81c3a6d2b Fix look and feel v10 2019-05-26 18:23:30 +02:00
Alexandre SPANGARO
ea13657617 Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2 2019-05-26 14:23:47 +02:00
Laurent Destailleur
19ff0120ff # WARNING: head commit changed in the meantime 
Removed uselesss files (replaced by DebugBar)
 2019-05-26 11:42:00 +02:00
Laurent Destailleur
a40e5ca66c Fix phpcs 2019-05-26 11:36:16 +02:00
Laurent Destailleur
ccfb4f575b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-24 14:58:21 +02:00
Laurent Destailleur
18f1952e2d Fix set of properties 2019-05-22 14:49:18 +02:00
Marc de Lima Lucio
54f8c98b27 FIX: remove isolated transaction commit 2019-05-22 11:12:02 +02:00
Marc de Lima Lucio
66dd7e30ae FIX: situation invoices: block progress percentage change for discount lines 2019-05-22 10:46:38 +02:00
Regis Houssin
4f2f23f522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-22 08:45:31 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
6365c7cd00 Bad cut and paste 2019-05-21 12:17:07 +02:00
Regis Houssin
2cf630c213 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-20 16:10:47 +02:00
Laurent Destailleur
321544b3fa Fix phpcs 2019-05-20 15:25:39 +02:00
Laurent Destailleur
c3732f2b7a Fix edition of margins in recurring invoices 2019-05-20 14:41:47 +02:00
Laurent Destailleur
83c369cc0f Add $array_to_check for property in invoice instead of thirdparty 2019-05-20 13:02:33 +02:00
Laurent Destailleur
91dd8a71d3 Fix syntax error 2019-05-20 12:50:00 +02:00
Laurent Destailleur
827a2e1809 Fix test if qualified for stock change at wrong place 2019-05-20 12:47:02 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
florian HENRY
7f8c118466 fix: #11015 2019-05-19 01:52:50 +02:00
ATM-Marc
83c38570e9 FIX: invoice class: bad SQL request if product type not set 2019-05-19 01:01:21 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
26d4875f8f Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 02:27:23 +02:00
Laurent Destailleur
68118e55dc
Update api_invoices.class.php 2019-05-18 00:58:43 +02:00
Maxime Kohlhaas
1af69d4c8f Fix varnames in invoice api 2019-05-18 00:40:29 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta 2019-05-16 21:21:51 +02:00
Laurent Destailleur
9f8f45d5bc FIX Payment on supplier invoice should not mix credit note and standard 
invoices.
 2019-05-14 12:00:58 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Regis Houssin
62489d1f5e FIX replace "dir_output" with "multidir_output" 2019-05-12 14:41:30 +02:00
Regis Houssin
b73df2698d FIX better compatibility with Multicompany 2019-05-12 14:25:41 +02:00
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-10 17:45:33 +02:00
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Laurent Destailleur
9de0e69456 FIX column project into list 2019-05-10 15:11:06 +02:00
Laurent Destailleur
5625c94c44 Fix missing label on project tooltip 2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e Fix missing label on project tooltip 2019-05-10 14:39:05 +02:00