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

1588 Commits

Author SHA1 Message Date
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/list.php
 2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
4d959bbea7 Fix consistency of label of proposal status 2018-10-09 14:06:45 +02:00
Philippe GRAND
af0bcb2631 Standardize code 2018-10-09 09:40:00 +02:00
Laurent Destailleur
91038af84d FIX properties on proposal must not be modified if error 2018-10-08 18:15:46 +02:00
Laurent Destailleur
c930218dd2 FIX Missing transaction around action 2018-10-08 17:40:17 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Laurent Destailleur
e2f450aa8c Fix regession losing description. 
Rename updateligne into updateline.
 2018-09-28 16:15:17 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Frédéric FRANCE
1d43c6bc3a
call to deprecated add_object_linked was present two times 2018-09-19 10:57:59 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Frédéric FRANCE
bcc9a3d259
reduce complexity of libstatut propal.class.php 2018-09-13 21:45:46 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00
Laurent Destailleur
3d50c454c1 Code comment 2018-09-03 17:05:44 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace 
PSR2 FunctionClosingBrace
 2018-09-01 12:06:08 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix 2018-09-01 09:40:50 +02:00
Laurent Destailleur
7b1a705be4 Clean duplicate code 2018-08-31 13:50:58 +02:00
ksar-ksar
49d3bea192 Remove the test 
After discussion with Frederic, the best solution is to remove the test
 2018-08-30 11:27:48 +02:00
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-30 10:42:47 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:22:50 +02:00
Laurent Destailleur
8b291b2053 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	README.md
 2018-08-29 19:55:10 +02:00
Laurent Destailleur
0c11007e34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	README.md
	htdocs/comm/propal/card.php
 2018-08-29 18:53:39 +02:00
gauthier
61a57e619f FIX : $fk_account is always empty, must be $soc->fk_account 2018-08-28 16:54:04 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
534eadb7a2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:35:43 +02:00
atm-ph
d9beb3f882 Fix tms missing in fetch propal 2018-08-27 10:19:07 +02:00
ksar-ksar
a844855ade Update hook formConfirm 
The hook should be called when the $formconfirm is not empty
 2018-08-24 16:40:26 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Philippe GRAND
449ef9c464 Update and standardize code 2018-08-22 18:12:44 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration 
function declaration
 2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123 
New : Add total price on dashboard
 2018-08-21 13:33:33 +02:00
Laurent Destailleur
0f1e5a78c6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 13:17:11 +02:00
Frédéric FRANCE
71d3af8b07
Update propal.class.php 2018-08-17 13:44:07 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
2719c4eb43 Fix escape 2018-08-16 01:01:38 +02:00
Laurent Destailleur
4b7889b295 Fix left join broken 2018-08-16 01:00:38 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
61a5be6e2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:19:21 +02:00
Laurent Destailleur
b81b6b651f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:17:26 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Laurent Destailleur
3d4d42462c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Laurent Destailleur
9b50bc2197 Fix css 2018-08-09 19:29:48 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Juanjo Menent
ca7666793b
Merge pull request #9213 from fmarcet/develop 
New: Sales representative column on Propal List
 2018-08-08 11:11:20 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Ferran Marcet
c74ffade7d New: Sales representative column on Propal List 2018-08-07 10:05:50 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Laurent Destailleur
b01f07efda
Merge branch 'develop' into FIX_project_overview 2018-08-02 18:43:55 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018 
standardize
 2018-08-02 11:27:02 +02:00
Philippe GRAND
d1f100b0c9 standardize 2018-07-29 17:17:29 +02:00
Laurent Destailleur
7af42c66cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
 2018-07-27 12:54:45 +02:00
Frédéric FRANCE
b90d125fda
trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable 2018-07-26 09:41:44 +02:00
Philippe
d7f58d0087 FIX search on ref project on propal list 2018-07-24 20:28:49 +02:00
Philippe GRAND
2a6f050e32 Clean and update code 2018-07-24 18:28:56 +02:00
Laurent Destailleur
f3b7bc53bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2018-07-15 20:16:08 +02:00
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Laurent Destailleur
c0d6aee040
Update propal.class.php 2018-07-10 11:10:01 +02:00
Laurent Destailleur
ed3023f7d9
Update propal.class.php 2018-07-10 11:09:08 +02:00
Laurent Destailleur
dc7fcc009b
Update propal.class.php 2018-07-10 10:56:45 +02:00
Marc de Lima Lucio
2ba7c07574 FIX: propal: correctly preset project when creating with origin/originid 2018-07-09 17:34:31 +02:00
BENKE Charlene
bfe7cd0d9f
Update propal.class.php 2018-07-05 12:11:20 +02:00
Laurent Destailleur
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany 
Fix: possibility to overload permissions (multicompany sharing)
 2018-07-02 16:12:40 +02:00
Laurent Destailleur
7c5aa148d9 Fix fetch 2018-07-02 15:26:01 +02:00
Regis Houssin
26495fb698 Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!! 2018-07-01 18:49:37 +02:00
Regis Houssin
05c666c18b Fix: use numbering model corresponding to the entity of the object 2018-07-01 17:06:19 +02:00
Regis Houssin
df55bee8ae Fix: missing "$disableremove" global 2018-07-01 15:33:10 +02:00
Regis Houssin
c0c8a70dd5 Fix: permissions 2018-07-01 12:21:51 +02:00