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

76571 Commits

Author SHA1 Message Date
Laurent Destailleur
ce1649233d FIX CSS 2020-07-09 12:39:00 +02:00
Laurent Destailleur
8589e122c6 css 2020-07-09 11:58:44 +02:00
Laurent Destailleur
56c90c289a Prepare 12.0.2 2020-07-08 18:19:20 +02:00
Laurent Destailleur
1dfd2d565b FIX Reposition and nav 2020-07-08 18:18:47 +02:00
Laurent Destailleur
edb4aac8d3 CSS 2020-07-08 18:09:35 +02:00
Laurent Dinclaux
f2adc3de4f Fix Dolibarr/dolibarr#14181. Limits and accuracy form not saving modified values 2020-07-07 18:03:11 +11:00
Laurent Destailleur
67c164df07 FIX reposition was broken if url end with #anchor 2020-07-06 22:27:19 +02:00
Laurent Destailleur
415398fc66 Better contrast 2020-07-06 21:06:32 +02:00
Laurent Destailleur
e13d3ce657 Trans 2020-07-06 20:57:47 +02:00
Laurent Destailleur
f72a836231 Fix look and feel v12 2020-07-06 16:59:25 +02:00
Laurent Destailleur
4dcc073b3a Fix param GETPOST 2020-07-06 16:54:30 +02:00
Laurent Destailleur
3939a640e9 Fix note in creation 2020-07-06 16:52:28 +02:00
Laurent Destailleur
61a7f54877 Fix look and field 2020-07-06 15:55:41 +02:00
Laurent Destailleur
7d7ef1e72a FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY 
Fix setup of product
 2020-07-06 15:34:26 +02:00
Laurent Destailleur
471f3e66e6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-06 12:27:43 +02:00
Laurent Destailleur
6a41d5bba8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/projet/tasks/list.php
 2020-07-06 12:27:25 +02:00
Laurent Destailleur
21bec139ca
Merge pull request #14183 from FHenry/12.0 
remove warning when date end contract line empty
 2020-07-06 12:06:42 +02:00
Laurent Destailleur
b4cd670b09
Merge pull request #14186 from atm-gauthier/10.0_fix_search_soc 
FIX : soc filter doesn't work on task list
 2020-07-06 12:05:40 +02:00
Laurent Destailleur
091fbb2824 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8 Fix menu organisation. 2020-07-06 11:52:28 +02:00
Laurent Destailleur
1e9ae1bc02 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851 Fix regression 2020-07-06 11:31:05 +02:00
Laurent Destailleur
1399ac9b41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-06 11:28:17 +02:00
Laurent Destailleur
053a1a2230 Fix duplicate code 2020-07-06 11:22:30 +02:00
Laurent Destailleur
056aa81ed3 Fix responsive 2020-07-06 10:59:23 +02:00
gauthier
466b7e84ef FIX : soc filter doesn't work on task list 2020-07-06 09:58:44 +02:00
Laurent Destailleur
b76828df9f Fix use of newtoken() 2020-07-06 09:39:26 +02:00
Laurent Destailleur
9cd8c3738f Fix trans 2020-07-05 23:18:19 +02:00
Laurent Destailleur
8df431f525 Look and feel v12 2020-07-05 13:30:56 +02:00
Laurent Destailleur
54a77a604c FIX Missing token 2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e Look and feel v12 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5 Trans 2020-07-05 12:47:32 +02:00
Laurent Destailleur
b726e96f4b FIX Update form erased extrafields that were hidden 2020-07-04 17:09:20 +02:00
florian HENRY
03ae31eced remove warning when date end contract line empty 2020-07-04 16:37:50 +02:00
florian HENRY
335a767f22 remove warning when date end contract line empty 2020-07-04 16:37:11 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
9912ffd555 Fix position of button 2020-07-04 13:45:28 +02:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
dd9cb8e781 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-03 19:27:42 +02:00
Laurent Destailleur
e256ce5c4b Debug credit transfer module 2020-07-03 19:27:23 +02:00
Laurent Destailleur
636f1e642d Fix param of product id to switch to list of order 2020-07-03 01:31:48 +02:00
Laurent Destailleur
4fba3ec872
Merge pull request #14115 from atm-florian/10.0 
fix entity on supplier order
 2020-07-03 00:50:51 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html 
FIX html lost on html extrafield
 2020-07-03 00:49:31 +02:00
Laurent Destailleur
b88e159495 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
 2020-07-03 00:46:18 +02:00
Laurent Destailleur
ec98ffb492 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:40 +02:00
Laurent Destailleur
59049cd047 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:32 +02:00
Laurent Destailleur
8d8695ccd7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:40:59 +02:00
oscim
ca66eac76c Update project.class.php 
Fix order of delete extra prev table of project
 2020-07-03 00:40:15 +02:00
Laurent Destailleur
18fa4c4105
Update card.php 2020-07-03 00:38:31 +02:00
Laurent Destailleur
fd617658ef Fix syntax 2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d fix #14143 2020-07-03 00:34:50 +02:00
Tim Otte
bce0a93227 Hotfix for an error in v12 2020-07-03 00:33:54 +02:00
Laurent Destailleur
836ccfd595 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-03 00:32:25 +02:00
Laurent Destailleur
9c504c1b3d
Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields 
FIX change selected fields on company card
 2020-07-03 00:30:34 +02:00
Laurent Destailleur
0ea55209ae
Merge pull request #14165 from ptibogxiv/patch-345 
FIX non numeric value on comm/card.php
 2020-07-03 00:24:32 +02:00
ksar
0a13e03792 FIX : Correct ModuleBuilder left menu 2020-07-03 00:21:39 +02:00
Laurent Destailleur
d24c6f7a81
Merge pull request #14164 from ptibogxiv/patch-344 
FIX takepos 12 hook
 2020-07-03 00:20:28 +02:00
Laurent Destailleur
75409e3ed0
Merge pull request #14171 from hregis/12.0_bug 
FIX missing possibility to change entity when propal cloning
 2020-07-03 00:18:35 +02:00
Laurent Destailleur
6c01cc16f8
Update commande.class.php 2020-07-03 00:14:22 +02:00
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +02:00
quentin
642e75c3dd FIX wrong origin 2020-07-02 14:16:31 +02:00
Regis Houssin
a5431a40da FIX missing possibility to change entity when propal cloning 2020-07-02 10:16:20 +02:00
Laurent Destailleur
ae0c738980 FIX Entry from stripe intent were reported into SEPA payments 
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
 2020-07-01 19:42:28 +02:00
Laurent Destailleur
d3c23428d5 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:01:46 +02:00
ptibogxiv
cc132775f3
FIX non numeric value on comm/car.php 2020-07-01 16:18:19 +02:00
stickler-ci
92f4744d11 Fixing style errors. 2020-07-01 13:22:43 +00:00
ptibogxiv
5e259d26ab
FIX takepos hook 
can add more than 1 button within 1 module
 2020-07-01 15:20:42 +02:00
Laurent Destailleur
e2a9743dd4 Debug module credit transfer 2020-07-01 14:19:47 +02:00
Laurent Destailleur
5f2486049e Fix trans 2020-07-01 13:22:15 +02:00
Laurent Destailleur
5f37f54675 Fix warning 2020-07-01 13:16:06 +02:00
lvessiller
918e669c98 FIX change selected fields on company card 2020-06-30 16:33:18 +02:00
Laurent Destailleur
5afd518718 Update vat rate for Congo 2020-06-30 13:06:44 +02:00
Laurent Destailleur
4f1ac84a19 Fix can't find link to edit table plan 2020-06-30 12:07:24 +02:00
gauthier
6553c40bea FIX : create a deposit with amount using comma didn't work 2020-06-30 11:23:55 +02:00
Laurent Destailleur
9bb0ef04f5 Fix upload of file in import module 2020-06-29 18:07:51 +02:00
Laurent Destailleur
f34a3785f0 FIX CSS 2020-06-29 16:02:50 +02:00
Laurent Destailleur
3d8d55a531 Fix bad path in import section 2020-06-29 14:42:09 +02:00
Laurent Destailleur
b64fc7dc3f FIX Avoid warning when creating a module with already existing files 2020-06-29 14:37:36 +02:00
Laurent Destailleur
5b3670f300 FIX SQL syntax error when editing extrafields 
Conflicts:
	htdocs/core/lib/security.lib.php
 2020-06-29 14:28:53 +02:00
Laurent Destailleur
8bb11039dc Clean code 2020-06-29 09:56:04 +02:00
Laurent Destailleur
7c4e737668 Clean code 2020-06-29 09:53:55 +02:00
Laurent Destailleur
68b4866438 Trans 2020-06-29 09:43:39 +02:00
Laurent Destailleur
eb30f6ed1a Prepare 12.0.1 2020-06-29 09:15:49 +02:00
Francis Appels
5d65b5f660 fix html should not do price2num 2020-06-29 09:07:54 +02:00
Laurent Destailleur
600a24346a Some people are missing this table 2020-06-28 22:09:17 +02:00
Laurent Destailleur
a5893db106 FIX upload documents into manual ECM was reported a permission error 2020-06-28 22:05:55 +02:00
Laurent Destailleur
70efaa4235 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-28 21:48:02 +02:00
Laurent Destailleur
95729e2375 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/company.lib.php
 2020-06-28 21:46:08 +02:00
Laurent Destailleur
960512acd9
Update fournisseur.commande.class.php 
Action with filter on rowid does not need to have test on entity
 2020-06-28 21:21:35 +02:00
Laurent Destailleur
1194c61857
Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2 
FIX 10.0 - fatal with postgreSQL
 2020-06-28 21:20:20 +02:00
Laurent Destailleur
dfb7c3e194
Update fournisseur.commande.class.php 2020-06-28 21:14:49 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1 
FIX: SQL Problem in customer invoice list
 2020-06-28 21:13:17 +02:00
Laurent Destailleur
d98c54c445
Merge pull request #14132 from aspangaro/12p2 
FIX: SQL Problem in supplier invoice list
 2020-06-28 21:11:56 +02:00
Laurent Destailleur
08b3cc5033
Merge pull request #14133 from aspangaro/12p3 
FIX: SQL Problem in social contribution list
 2020-06-28 21:11:35 +02:00
Laurent Destailleur
a11f7d1070
Update list.php 2020-06-28 21:11:25 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate 
Fix missing translate key
 2020-06-28 21:07:49 +02:00