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

67557 Commits

Author SHA1 Message Date
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
b37f55d13a Add log 2019-06-29 16:06:40 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
d71330c00b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +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
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
Laurent Destailleur
cd024da628
Merge branch 'develop' into new_branch_27_06_2019 2019-06-28 13:39:27 +02:00
Laurent Destailleur
a65d3d039d
Merge pull request #11420 from fbosman/develop 
Fix #11331 Bug: extrafields type double wrong length
 2019-06-28 12:56:46 +02:00
Laurent Destailleur
ff7ae5ef20
Update extrafields.class.php 2019-06-28 12:56:31 +02:00
Laurent Destailleur
511be75fca
Update actions_extrafields.inc.php 2019-06-28 12:55:19 +02:00
Laurent Destailleur
a33071d779 FIX #11421 2019-06-28 12:52:35 +02:00
Laurent Destailleur
039aafc1f5
Merge pull request #11409 from aspangaro/11.0_hook_generalledger 
NEW: Accountancy - Add hook bookkeepinglist on general ledger
 2019-06-28 12:42:46 +02:00
Laurent Destailleur
1930277257
Merge pull request #11410 from ptibogxiv/patch-195 
Fix qty to negative if refund
 2019-06-28 12:38:06 +02:00
Laurent Destailleur
0725ce0e3f
Update consumption.php 2019-06-28 12:37:44 +02:00
Laurent Destailleur
1b33952028
Update facture.php 2019-06-28 12:37:22 +02:00
Laurent Destailleur
2926bf4158 code comment 2019-06-28 12:35:25 +02:00
VESSILLER
f4978e9473 FIX/NEW - Force mandatory order method 2019-06-28 10:58:31 +02:00
fbosman
f44203775a
Update extrafields.class.php 2019-06-28 07:10:28 +02:00
fbosman
af83d8836a
Update actions_extrafields.inc.php 2019-06-28 07:06:19 +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
ad53289a19 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-27 20:13:51 +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
VESSILLER
e6ee1e7041 FIX Force order method in order supplier before making order 2019-06-27 14:21:38 +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
7f9b407c37 Sync transifex 2019-06-27 13:52:46 +02:00
Laurent Destailleur
84e4def180 Transifex sync 2019-06-27 13:39:54 +02:00
Philippe GRAND
2c237b8420 translations 2019-06-27 09:51:48 +02:00
Philippe GRAND
5a4ba837cc translations 2019-06-27 09:47:00 +02:00
Philippe GRAND
6e8d86fb4a translations 2019-06-27 09:43:50 +02:00
Philippe GRAND
f1e40b4b22 translations 2019-06-27 09:31:42 +02:00
Philippe GRAND
5a8cc4934b translations 2019-06-27 09:29:00 +02:00
Philippe GRAND
c20f9a4842 translations 2019-06-27 09:22:44 +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
ptibogxiv
55bd67058b
Update facture.php 2019-06-26 14:10:52 +02:00
ptibogxiv
b2ec60d53b
Fix qty to negative if refund 2019-06-26 14:08:51 +02:00
Alexandre SPANGARO
59f8fb77da Travis 2019-06-26 13:59:32 +02:00
Laurent Destailleur
7c73004171 Fix trans 2019-06-26 13:14:16 +02:00
Alexandre SPANGARO
c9a36cede6 Update work 2019-06-26 11:13:34 +02:00
Alexandre SPANGARO
a6a0e2bc77 NEW: Accountancy - Add hook bookkeepinglist on general ledger 2019-06-26 10:58:36 +02:00
ptibogxiv
30dd3a76d2
Update contrat.class.php 2019-06-26 08:23:06 +02:00
Laurent Destailleur
68bc096ef3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 23:41:56 +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
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +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
ptibogxiv
7f11077f1e
Update propal.class.php 2019-06-25 18:16:11 +02:00
ptibogxiv
c81ffcd8f0
Update facture.class.php 2019-06-25 18:14:56 +02:00
ptibogxiv
c813c33e42
Update contrat.class.php 2019-06-25 18:13:53 +02:00
ptibogxiv
174e531d69
Update commande.class.php 2019-06-25 18:12:16 +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
0c3f524319 Clean code 2019-06-25 16:12:16 +02:00
Laurent Destailleur
f6719db4f3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 16:09:08 +02:00
Laurent Destailleur
33ce52364a Drop no more used column 2019-06-25 16:08:22 +02:00
Laurent Destailleur
a98ceb584d Fix syntax error 2019-06-25 16:08:01 +02:00
ptibogxiv
87d4e4e356
Update contrat.class.php 2019-06-25 15:49:47 +02:00
ptibogxiv
a9adccabc3
Update contrat.class.php 2019-06-25 15:48:41 +02:00
ptibogxiv
df0d540ffb
Update propal.class.php 2019-06-25 15:47:16 +02:00
ptibogxiv
66eec4da52
Update facture.class.php 2019-06-25 15:46:12 +02:00
ptibogxiv
9e88bf1f1c
NEW multilangs in fetch_lines 2019-06-25 15:41:20 +02:00
Laurent Destailleur
1bce2f085e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 14:32:03 +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
atm-quentin
4b3824a1a9 FIX buyprice barcode default val 2019-06-25 14:17:31 +02:00
Laurent Destailleur
f984a77044 FIX Fallback on main language for alternative languages 2019-06-25 14:05:10 +02:00
Laurent Destailleur
fffdd8797d FIX Fallback on main language for alternative languages 2019-06-25 14:04:34 +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
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
 2019-06-25 13:03:54 +02:00
Laurent Destailleur
def94b55c0 CSS 2019-06-25 13:02:11 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1c924ef17e Fix bad label on supplier invoice 2019-06-25 12:54:02 +02:00
Laurent Destailleur
8cc6c18931 Fix bad label on supplier invoice 2019-06-25 12:53:23 +02:00
Laurent Destailleur
3c6d271c67 Removed deprecated fields 2019-06-25 12:42:36 +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
Laurent Destailleur
7de0f5c0be NEW Avoid wrap between picto and text on getNomUrl 2019-06-25 10:22:39 +02:00
Laurent Destailleur
6b8262bd8f Fix status not loaded 2019-06-25 10:12:24 +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
d048c0f125 Removed dead code 2019-06-24 23:00:04 +02:00
Laurent Destailleur
43d65e8073 Add hook 2019-06-24 22:59:00 +02:00
Laurent Destailleur
3ca258c93d Remove dead code 2019-06-24 22:58:21 +02:00
Laurent Destailleur
83ec64d473 Add hook getnomurltooltip on contract 2019-06-24 22:52:27 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
ad0ed2bb19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 21:03:16 +02:00
Laurent Destailleur
d49891d009 All ->lignes were renamed into ->lines 2019-06-24 21:03:04 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
Laurent Destailleur
f66281d7e5
Update modAccounting.class.php 2019-06-24 19:50:22 +02:00
Laurent Destailleur
366efff633
Merge pull request #11107 from gentooza/develop 
NEW adding 'formObjectOptions' hooks loading at card.php of adherents module
 2019-06-24 19:20:36 +02:00
Laurent Destailleur
c3a109d790
Update card.php 2019-06-24 19:20:27 +02:00
Laurent Destailleur
2a3b4c3fd7
Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse 
NEW add extrafield separator collapsing capabilities
 2019-06-24 19:04:51 +02:00
Laurent Destailleur
9961b9c132
Merge pull request #11136 from ptibogxiv/patch-175 
NEW add multicurrency rate at currency list API
 2019-06-24 19:00:27 +02:00
Laurent Destailleur
604633afd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 18:45:15 +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
57140b79dc Restore official text of licence 2019-06-24 18:30:07 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared 
NEW Add global task declared progression
 2019-06-24 18:12:55 +02:00
Laurent Destailleur
35c3eb0d7e Fix conflict in a translation key 2019-06-24 17:59:00 +02:00
Laurent Destailleur
857233f175
Merge pull request #11394 from grandoc/new_branch_23_06_2019 
New branch 23 06 2019
 2019-06-24 16:40:50 +02:00
Laurent Destailleur
cc64e0fe52 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:36:26 +02:00
Laurent Destailleur
609eefaf08 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:36:08 +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
202fbf5e7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:31:09 +02:00
Laurent Destailleur
bf731e3de6 Fix trans 2019-06-24 16:30:55 +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
cade08342c
Merge pull request #11390 from grandoc/develop 
translation
 2019-06-24 15:30:30 +02:00