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

9568 Commits

Author SHA1 Message Date
Laurent Destailleur
82bda63920
Merge pull request #12296 from frederic34/patch-20 
Update index.php
 2019-11-02 10:09:55 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/holiday/list.php
 2019-11-01 21:06:06 +01:00
Frédéric FRANCE
8b98df296f
Update info.php 2019-11-01 17:36:11 +01:00
Frédéric FRANCE
6dd8e7152c
Update index.php 2019-11-01 17:31:34 +01:00
Frédéric FRANCE
38b86d4bde
Update payments.php 2019-11-01 17:30:49 +01:00
Frédéric FRANCE
61873aa1a8
Update list.php 2019-11-01 17:29:21 +01:00
Frédéric FRANCE
5314ff70f5
Update index.php 
in class ref and rowid are the same, lib is deprecated and is label
 2019-11-01 17:26:53 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Philippe Grand
9fad5dc8fc
Update chargesociales.class.php 2019-11-01 11:16:47 +01:00
Philippe Grand
f568241a81
Update cashcontrol.class.php 2019-11-01 11:16:20 +01:00
stickler-ci
0c6938aa2a Fixing style errors. 2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502 add some comment 2019-11-01 10:42:14 +01:00
Laurent Destailleur
a0e377feb3 Look and feel v11 2019-10-31 22:11:26 +01:00
Laurent Destailleur
a1700e71be Fix phpcs 2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
607c38775d Use popup 2019-10-31 14:57:05 +01:00
Laurent Destailleur
360b3a9550 NEW Ask the new label and new dates in confirm popup when cloning tax 2019-10-31 14:06:26 +01:00
Frédéric FRANCE
f202424432
css 2019-10-30 18:52:54 +01:00
Laurent Destailleur
923ab59e4e
Merge pull request #12219 from frederic34/patch-7 
css
 2019-10-30 03:13:14 +01:00
Laurent Destailleur
8849cd9897
Update index.php 2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1 Fix sign for VAT repaid in report 2019-10-29 17:10:10 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193
start clean indent in compta directory 2019-10-26 14:42:25 +02:00
Frédéric FRANCE
99b338b468
Update index.php 2019-10-24 23:09:58 +02:00
Laurent Destailleur
b4eb14ee44 Use dolGetStatus 2019-10-24 16:43:23 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
31ad147e0e Look and feel v11 2019-10-23 15:17:01 +02:00
Laurent Destailleur
02f559db5f Use GETPOST 2019-10-23 15:07:21 +02:00
Laurent Destailleur
564f96c092 Fix scrutinizer warnings 2019-10-23 14:59:02 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Alfredo Altamirano
f2e5a23547 Declaration of $soc should not be conditional 2019-10-20 13:47:39 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Frédéric FRANCE
a16b7bcda6
cut long lines 2019-10-19 19:16:28 +02:00
Laurent Destailleur
78ac543dee Fix link to list 2019-10-18 20:01:47 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
f7782873a5 Look and feel v11 2019-10-17 15:58:24 +02:00
Laurent Destailleur
c58a006703 NEW Show POS application and terminal on invoice card. 2019-10-17 15:56:50 +02:00
Laurent Destailleur
5e12dcc6b1 Fix on FACTURE_ENABLE_NEGATIVE 2019-10-17 15:40:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
b9ec45fd49 Clean code 2019-10-16 14:02:13 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
ebd8bc3645
Merge pull request #12107 from frederic34/patch-14 
Update list.php
 2019-10-14 20:57:01 +02:00
Laurent Destailleur
1f672221ec
Merge pull request #12106 from frederic34/patch-13 
avoid ErrorBadValueForParamNotAString if not configured
 2019-10-14 20:55:06 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop 
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
 2019-10-14 20:39:08 +02:00
Laurent Destailleur
dbdc62b028 Fix td 2019-10-14 18:41:46 +02:00
stickler-ci
4b7987374b Fixing style errors. 2019-10-14 14:46:04 +00:00
Laurent Destailleur
dba9450b01 css 2019-10-14 16:03:12 +02:00
Laurent Destailleur
28339920b3 Translation 2019-10-14 16:00:03 +02:00
Laurent Destailleur
323f31d832 Trans frequency 2019-10-13 20:54:00 +02:00
Laurent Destailleur
f91b98d326 Add frequency in template invoice popup 2019-10-13 20:50:03 +02:00
Frédéric FRANCE
b424fc6e27
Update list.php 2019-10-12 18:57:08 +02:00
Frédéric FRANCE
cef935468d
Update list.php 2019-10-12 18:40:39 +02:00
Laurent Destailleur
bcc41c2a33 NEW Can filter on description on bank account transaction lists. 2019-10-12 13:19:10 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
ro@t.com
2149b155d1 ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning 2019-10-10 15:57:26 +02:00
Laurent Destailleur
b34cbfad74 Rename const 2019-10-10 15:23:45 +02:00
Laurent Destailleur
015d51c169 NEW Add column of module source and POS terminal in invoice list. 2019-10-10 15:10:41 +02:00
Laurent Destailleur
b6c600c171 css 2019-10-10 11:44:03 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255 2019-10-08 19:37:42 +02:00
Laurent Destailleur
5970ea5b79
Update releve.php 2019-10-08 15:48:29 +02:00
Laurent Destailleur
d6bf0fa483
Update releve.php 2019-10-08 15:47:47 +02:00
fuhraih
368b34c5c2
FIX #11835 
FIX #11835 edit Bank Statements in second Page and so on not working
 2019-10-08 15:34:35 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon 
Fix Fa-icon
 2019-10-07 13:03:27 +02:00
Laurent Destailleur
52c06c1815 Fix css 2019-10-06 19:28:08 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
Laurent Destailleur
0b9d27423d FIX Can't modify vendor invoice if transfered into accountancy 2019-10-04 10:31:57 +02:00
Laurent Destailleur
6cd3d27885 Fix comparison 2019-10-04 09:54:52 +02:00
Alexandre SPANGARO
14381927c7 Fix Bank Fa-icon 2019-10-03 20:32:15 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/card.php
 2019-10-03 17:53:59 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
1c92c2d8bc
Merge pull request #11993 from frederic34/patch-12 
Update chargesociales.class.php for doxygen
 2019-10-01 11:15:45 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
3ba48fde93
Update api_invoices.class.php 2019-09-30 21:44:37 +02:00
Frédéric FRANCE
ea008aefd7
Update chargesociales.class.php 2019-09-30 20:21:10 +02:00
Frédéric FRANCE
0c908fb4ed
Update chargesociales.class.php 2019-09-30 20:13:43 +02:00
Laurent Destailleur
14f7e48fe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 18:50:33 +02:00
Laurent Destailleur
a56b9e1ca9 The trigger BON_PRELEVEMENT has been renamed into 
DIRECT_DEBIT_ORDER_CREATE.
 2019-09-30 18:50:23 +02:00
Laurent Destailleur
cff8f582e7
Update bonprelevement.class.php 2019-09-30 18:47:18 +02:00
Laurent Destailleur
9d5b84ec44
Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing 2019-09-30 18:39:46 +02:00
Laurent Destailleur
2da5a506a9
Update facture.class.php 2019-09-30 18:25:03 +02:00
Laurent Destailleur
564e22009d
Update facture.class.php 2019-09-30 18:22:37 +02:00
Laurent Destailleur
4f356fa412
Merge pull request #11859 from altatof/avoir 
FIX : allow standalone credit note even if no invoice
 2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php 2019-09-30 18:12:43 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
ptibogxiv
4177c72ae0
Update facture.class.php 2019-09-29 15:46:28 +02:00
ptibogxiv
2e8b99606e
Update facture.class.php 2019-09-29 15:45:41 +02:00
ptibogxiv
5a096972c0
Update list.php 2019-09-29 15:42:39 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
07b555b965
Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop 
Fix: Load invoices only if showed
 2019-09-27 14:34:16 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
6d1a571aed Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-09-27 14:07:11 +02:00
Laurent Destailleur
5d45638248 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-27 14:02:23 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
e38bb89a2e NEW Add fa_icon on load_fiche_titre 2019-09-27 11:48:40 +02:00
Laurent Destailleur
99cfea1ff4
Update paiement_charge.php 2019-09-27 11:34:50 +02:00
Alexandre SPANGARO
b52e5d51e3 FIX colspan on VAT quadri report 2019-09-26 22:01:59 +02:00
Ferran Marcet
a8cc11d232 Merge branch 'developup' into develop 2019-09-24 13:38:11 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
gauthier
575e4d11d0 FIX : wrong test 2019-09-19 17:28:51 +02:00
Laurent Destailleur
a43253eab8 Fix for deposit not correctly closed 2019-09-17 18:49:56 +02:00
Laurent Destailleur
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/ligne.php
 2019-09-17 12:23:58 +02:00
Ferran Marcet
3f25a8d8d5 New: Load invoices only if showed 2019-09-17 09:38:08 +02:00
Ferran Marcet
e4984492b3 Dejarlo igual que develop 2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf Merge branch 'developup' into develop 
# Conflicts:
#	htdocs/compta/facture/fiche-rec.php
#	htdocs/install/mysql/migration/9.0.0-10.0.0.sql
 2019-09-17 09:27:42 +02:00
Laurent Destailleur
5233e7d8ad FIX do not output return code on screen after a select of bank account 2019-09-16 18:29:04 +02:00
Laurent Destailleur
6bfba0b731 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2019-09-15 15:17:38 +02:00
Alexandre SPANGARO
21e27389d4 NEW Bank Add an option for colorize background color of debit or credit movement 2019-09-14 20:58:12 +02:00
Alexandre SPANGARO
4420af683d Fix Bank entries - nowrap on amount 2019-09-14 05:44:28 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Christophe Battarel
c8cb5886f4 correction 2019-09-10 17:04:09 +02:00
Christophe Battarel
95417d4c86 allow standalone credit note even if no invoice 2019-09-10 16:24:04 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00
Laurent Destailleur
cad9a59d2a Add option to be able to find behaviour before the fix of list of 
invoice in direct debit order.
 2019-09-06 14:45:55 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists. 
FIX Confirmation of deletion
 2019-09-06 14:24:33 +02:00
Laurent Destailleur
bc7bf3b4b5 FIX bad consistency in list of invoice for direct debit order. 2019-09-06 13:44:02 +02:00
Laurent Destailleur
d1a5be20ea Fix wrong warning 2019-09-06 13:02:52 +02:00
ptibogxiv
5d81b0271d
Update facture.class.php 2019-09-06 11:40:26 +02:00
ptibogxiv
fc75d72290
Update list.php 2019-09-06 11:35:52 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
atm-ph
f7fe3d2842 Fix set var in context attribute instead of object attribute 2019-09-04 16:30:55 +02:00
Laurent Destailleur
481a25cb8f The hook "moreFamily" must return payment into var "totalpayment" and no 
more "paiement" (english replace french).
 2019-09-03 17:39:19 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Laurent Destailleur
84800257e8
Merge pull request #11799 from jtraulle/fix-11683-10.0 
Fix #11682 Missing origin object ref and thirdparty ref in future ban…
 2019-09-03 17:32:47 +02:00
Laurent Destailleur
7c07e64adc
Update treso.php 2019-09-03 17:32:18 +02:00
Laurent Destailleur
65fee73b22
Update treso.php 2019-09-03 17:31:20 +02:00
Laurent Destailleur
28c4f86c79 Fix regression 2019-09-03 16:23:39 +02:00
Laurent Destailleur
33cb9f7df4
Merge pull request #11776 from OPEN-DSI/fix-facture-duedate-and-paid 
FIX set due date in object in create invoice and set default paid in …
 2019-09-03 15:21:19 +02:00
Frédéric FRANCE
32343fba24
Optimize invoice situation doc 
with many many lines, it can be very very long to generate pdf
 2019-09-03 13:43:44 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Laurent Destailleur
f2af28f0e1 Clean code 2019-08-31 02:08:26 +02:00
Jean Traullé
8f1fba6775
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries 2019-08-30 23:56:52 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use 
getOutstandingBills() instead.
 2019-08-29 00:45:02 +02:00
VESSILLER
877867a6c2 FIX set due date in object in create invoice and set default paid in update invoice 2019-08-28 13:50:39 +02:00
atm-ph
5aa27a126a Fix trigger create on widthdraw is missing 2019-08-28 13:45:02 +02:00
Laurent Destailleur
e421b4b698 Trans 2019-08-28 10:12:39 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
f07d99ed9a
Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks 
Fix wrong placement to print title and missing hook to print value
 2019-08-26 17:14:50 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
60b8982a74 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-08-26 16:39:39 +02:00
Laurent Destailleur
fc1381c056
Merge pull request #11739 from ptibogxiv/patch-239 
Fix display context for takepos in invoice/list.php
 2019-08-26 16:38:27 +02:00
Alexandre SPANGARO
76691925a4 FIX Missing div for buttons in tax, loan, various payment modules 2019-08-26 15:35:20 +02:00
ptibogxiv
7112fcee9a
Update list.php 2019-08-24 15:54:14 +02:00
ptibogxiv
2be125e647
Fix display context for takepos in invoice list 
fix for thirdparty name and create button
 2019-08-24 15:47:17 +02:00
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