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

67394 Commits

Author SHA1 Message Date
Laurent Destailleur
42576eb27a Fix status of email templates not visible for non admin users 2019-07-05 17:22:13 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +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
Laurent Destailleur
5c6684bb73 Fix setup of ticket module 2019-07-05 11:53:33 +02:00
Laurent Destailleur
33bff1353c Fix css 2019-07-05 11:45:10 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +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
c3715646e7 Missing trans 2019-07-04 21:29:27 +02:00
Laurent Destailleur
4c03aa6547 Fix selection of profile for demo 2019-07-04 17:03:36 +02:00
Laurent Destailleur
ed39849d33 Fix css 2019-07-04 16:14:10 +02:00
Laurent Destailleur
fb8c93a69d FIX Bad sql request 2019-07-04 16:00:14 +02:00
atm-florian.m
8030735ded Merge branch 'FIX_add_checkbox_on_shipment_delete_confirm_dialog_to_ask_if_stock_should_be_incremented' into FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set 
(taking PR comments into account)
 2019-07-04 15:35:22 +02:00
atm-florian.m
64d1ebf59c FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion. 2019-07-04 15:06:39 +02:00
Regis Houssin
bfa7f22209 FIX missing "dropdown-icon" replacement 2019-07-04 14:55:41 +02:00
Laurent Destailleur
512b832c77 CSS 2019-07-04 13:26:20 +02:00
Laurent Destailleur
657a3ae4c5 FIX permission to delete a draft purchase order 2019-07-04 12:43:32 +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
8b0b824471 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-04 12:22:48 +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
f8de11492e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:25 +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
Laurent Destailleur
d04b19549e
Merge pull request #11453 from atm-greg/FIX_9.0_selectForFormsList_for_invoices 
fix case objecttmp is an invoice in selectForFormsList
 2019-07-04 12:20:56 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php 2019-07-04 12:20:34 +02:00
Laurent Destailleur
a9dfca70cf
Merge pull request #11452 from atm-florianm/FIX_minor_spelling_issues 
FIX: minor spelling issues
 2019-07-04 12:19:26 +02:00
Laurent Destailleur
1926d430d8
Merge pull request #11448 from ptibogxiv/patch-196 
Fix paymentmethod detach
 2019-07-04 12:12:18 +02:00
Laurent Destailleur
125c2a65c0
Merge pull request #11445 from atm-john/9.0_fix_dictionary 
Fix missing hidden input and short label
 2019-07-04 10:54:16 +02:00
Laurent Destailleur
108c7aa9ca
Merge pull request #11444 from aspangaro/10.0p1 
FIX SQL problem on donation & nowrap on amount
 2019-07-04 10:39:41 +02:00
Laurent Destailleur
10e3e37c6c
Update don.class.php 2019-07-04 10:39:30 +02:00
Laurent Destailleur
75aa11e526 Code comment 2019-07-04 02:02:44 +02:00
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
ff68b110b2 Fix phpcs 2019-07-02 23:14:22 +02:00
ptibogxiv
03938e2123
Update paymentmodes.php 2019-07-02 21:56:50 +02:00
ptibogxiv
126479b5a9
Fix paymentmethod detach 2019-07-02 21:46:00 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
Laurent Destailleur
d9560dbb61 Fix var not initialized 2019-07-02 18:02:06 +02:00
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
Laurent Destailleur
3b0f1c733f Fix missing token 2019-07-02 15:00:17 +02:00
Laurent Destailleur
8a25c854e9 Hide sensitive data 2019-07-02 14:38:26 +02:00
Alexandre SPANGARO
ab7cb7bb2e FIX Nowrap on amount 2019-07-02 12:01:50 +02:00
Laurent Destailleur
1b4507f07d Fix on a hidden option 2019-07-02 11:40:05 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
Laurent Destailleur
edd4d0751b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:28:44 +02:00
Laurent Destailleur
ef27e32f53 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:27:57 +02:00
Laurent Destailleur
3abaecfd77 Prepare 8.0.7 2019-07-01 13:27:18 +02:00
atm-florian.m
c45b191330 FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set, deleting a "closed" shipment now increases stock as expected 2019-07-01 10:26:03 +02:00
Laurent Destailleur
511b21ca9c Fix for doliwamp 2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be Fix for doliwamp 2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +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
fb42333b3e Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-06-29 23:20:07 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
e9c6a10bdd Fix phpcs 2019-06-29 18:35:36 +02:00
Laurent Destailleur
72084f4684 Fix protected 2019-06-29 16:49:32 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
8aebcc45b2 Fix message to not show sometimes 2019-06-29 01:54:38 +02:00
Laurent Destailleur
97827f5172 Fix print 2019-06-29 01:44:49 +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
a33071d779 FIX #11421 2019-06-28 12:52:35 +02:00
Laurent Destailleur
a8837f5645
Merge pull request #11413 from atm-quentin/FIX_ending_slash 
FIX ending slash
 2019-06-27 20:23:22 +02:00
Laurent Destailleur
63284e0f24 Trans 2019-06-27 19:42:22 +02:00
Laurent Destailleur
c7db76f05a Trans 2019-06-27 19:38:53 +02:00
Laurent Destailleur
ab1f0aba93 Fix trans 2019-06-27 19:28:40 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +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
7f9b407c37 Sync transifex 2019-06-27 13:52:46 +02:00
Laurent Destailleur
84e4def180 Transifex sync 2019-06-27 13:39:54 +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
Laurent Destailleur
244d21bd2b Fix trans 2019-06-27 00:45:17 +02:00
atm-quentin
49db277368 FIX ending slash 2019-06-26 16:42:14 +02:00
Laurent Destailleur
7c73004171 Fix trans 2019-06-26 13:14:16 +02:00
Laurent Destailleur
a68d9fc5e6 Fix css 2019-06-25 23:31:29 +02:00
Laurent Destailleur
f2ea78f2ec Removed useless files 2019-06-25 23:26:55 +02:00
Laurent Destailleur
9b9070dbf8 Removed useless files 2019-06-25 23:26:34 +02:00
Laurent Destailleur
7a0962a393 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAccounting.class.php
 2019-06-25 23:13:55 +02:00
Laurent Destailleur
83f5b23ade Doc 2019-06-25 22:39:04 +02:00
Laurent Destailleur
d5479cd9ae Fix import of ledger 2019-06-25 22:37:13 +02:00
Laurent Destailleur
20471c54e1 Fix import code (regex of data imported + import of constant) 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2019-06-25 22:27:00 +02:00
Laurent Destailleur
fc574946b1 Fix import of ledger 2019-06-25 22:23:51 +02:00
Laurent Destailleur
0ae0951d7d Fix import code (regex of data imported + import of constant) 2019-06-25 22:23:30 +02:00
Laurent Destailleur
85919d8324 Code comment 2019-06-25 22:02:19 +02:00
Laurent Destailleur
70967b4ea1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd Fix purge of old files 2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb Fix we need to keep temp dir 2019-06-25 19:02:24 +02:00
Laurent Destailleur
a2d50eb95a Fix sql regression 2019-06-25 18:12:12 +02:00
Laurent Destailleur
a776f3671b Fix demo profiles 2019-06-25 16:50:42 +02:00
Laurent Destailleur
27ad0d1f88 Trans 2019-06-25 16:35:25 +02:00
Laurent Destailleur
a98ceb584d Fix syntax error 2019-06-25 16:08:01 +02:00
Laurent Destailleur
171a173935 Fix phpcs 2019-06-25 14:30:48 +02:00
atm-quentin
7f62fdbfe4 FIX buyprice barcode default val 2019-06-25 14:27:44 +02:00
Laurent Destailleur
f984a77044 FIX Fallback on main language for alternative languages 2019-06-25 14:05:10 +02:00
Laurent Destailleur
700acbeefb Fix phpcs 2019-06-25 13:26:02 +02:00
Laurent Destailleur
2f7e9aa363 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
 2019-06-25 13:24:45 +02:00
Laurent Destailleur
c9883eecd2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/fichinter/list.php
 2019-06-25 13:23:19 +02:00
Laurent Destailleur
144f2a5159 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fichinter/list.php
 2019-06-25 13:15:57 +02:00
Laurent Destailleur
736f918bac Fix phpcs 2019-06-25 13:14:11 +02:00
Laurent Destailleur
de3ec5682c
Merge pull request #11403 from fmarcet/7.0 
FIX: Not showing Contract and Project columns on ficheinter list
 2019-06-25 13:07:03 +02:00
Laurent Destailleur
def94b55c0 CSS 2019-06-25 13:02:11 +02:00
Laurent Destailleur
1c924ef17e Fix bad label on supplier invoice 2019-06-25 12:54:02 +02:00
Laurent Destailleur
560f145a32 Fix css 2019-06-25 11:35:40 +02:00
Laurent Destailleur
b6ad78fdd9 Fix sort 2019-06-25 11:25:36 +02:00
Laurent Destailleur
b8b0ad0d27 Fix migration 2019-06-25 11:22:35 +02:00
Laurent Destailleur
5031b6c06b Fix bad id 2019-06-25 11:18:31 +02:00
Laurent Destailleur
5f17cfe462 Fix bad id 2019-06-25 11:09:13 +02:00
Laurent Destailleur
27be93f535 Fix bad id 2019-06-25 11:08:42 +02:00
Laurent Destailleur
4ed2db6d21 Fix bad id 2019-06-25 11:08:14 +02:00
Laurent Destailleur
e6b643e073 Fix syntax error 2019-06-25 11:07:14 +02:00
Laurent Destailleur
36f1527f76 Fix backward compatibility for type of members 2019-06-25 11:06:10 +02:00
Laurent Destailleur
ca3988ca73 Fix backward compatibility for type of members 2019-06-25 10:58:44 +02:00
Laurent Destailleur
732fd8a04b Fix look and feel v10 2019-06-25 10:28:58 +02:00
Laurent Destailleur
74f61b3b9a Fix status not loaded 2019-06-25 10:23:30 +02:00
Ferran Marcet
7f127989b2 FIX: Not showing Contract and Project columns on ficheinter list 2019-06-25 09:55:34 +02:00
Laurent Destailleur
d85ec982e5 Fix do not output log in arhived log for draft documents 2019-06-24 23:39:44 +02:00
Laurent Destailleur
51506724ef FIX Do no record log in archived log for draft documents. 2019-06-24 23:36:52 +02:00
Laurent Destailleur
31ffa6bc69 FIX #11218 #11150 2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100 FIX #11218 #11150 2019-06-24 18:40:31 +02:00
Laurent Destailleur
35c3eb0d7e Fix conflict in a translation key 2019-06-24 17:59:00 +02:00
Laurent Destailleur
ae1ad80994 Fix count 2019-06-24 16:32:42 +02:00
Laurent Destailleur
70f19b3a3d Fix counter of record 2019-06-24 16:31:56 +02:00
Laurent Destailleur
293b3987e8 CSS 2019-06-24 16:28:54 +02:00
Laurent Destailleur
28024d5cd1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:28:48 +02:00
Laurent Destailleur
b98874848f Fix backport 9.0 2019-06-24 16:12:54 +02:00
Laurent Destailleur
84575df7e6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail 
FIX mass send mail
 2019-06-24 15:34:06 +02:00
Laurent Destailleur
7bbbe49b70
Merge pull request #11389 from atm-john/9.0_fix_ancor 
Fix send mail ancor
 2019-06-24 15:29:36 +02:00
Laurent Destailleur
7e10208619
Merge pull request #11380 from atm-florian/9.0 
fix depending extrafeilds list
 2019-06-24 15:23:48 +02:00
Laurent Destailleur
43fc0466e5 Fix position of modules 2019-06-23 20:05:15 +02:00
Laurent Destailleur
a6fc75fed2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
 2019-06-23 18:12:30 +02:00
Laurent Destailleur
0854984a08 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-06-23 18:09:49 +02:00
Laurent Destailleur
b153019000 FIX security (a user can read leave or holiday of other without perm. 2019-06-23 18:08:24 +02:00
Laurent Destailleur
1c48b8be32 Fix code comment 2019-06-23 17:23:41 +02:00
Laurent Destailleur
8866ab5565 Fix missing trans 2019-06-23 16:42:06 +02:00
Laurent Destailleur
8a9c858609 Code comment 2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
71b266b5a8 Code comment 2019-06-22 19:20:01 +02:00
Laurent Destailleur
2854e0dae6 Code comment 2019-06-22 19:15:15 +02:00
Laurent Destailleur
d9f6d9f0c3 Code comment 2019-06-22 19:12:44 +02:00
Laurent Destailleur
e456cd27d1 Fix deprecated call and hide pass in debug 2019-06-22 18:42:24 +02:00
Laurent Destailleur
662afe8a36 Fix missing global 2019-06-22 18:24:29 +02:00
Laurent Destailleur
db241b22dd Fix clean of database 2019-06-22 14:33:31 +02:00
Laurent Destailleur
e6ea9cc448 Clean widget not correctly removed 2019-06-22 14:15:10 +02:00
Laurent Destailleur
64de57d781 FIX bad request 2019-06-22 13:28:20 +02:00
Laurent Destailleur
ee8ddb5744 Fix link to fix table charset 2019-06-22 13:23:00 +02:00