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

69110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
3210181a3d
rule for private function is different 2018-08-14 10:21:34 +02:00
Philippe GRAND
e35da2f84d Standardize code 2018-08-14 09:55:58 +02:00
atm-greg
ba6f7d4b0a fix infinite loop 2018-08-14 09:32:43 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
Laurent Destailleur
7c6f41e04f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-13 23:58:18 +02:00
Laurent Destailleur
fa4a12be41
Merge pull request #9208 from ptibogxiv/patch-33 
fix connect mode for v8 release
 2018-08-13 23:56:42 +02:00
Laurent Destailleur
848fcc4b17
Update actions_setnotes.inc.php 2018-08-13 23:53:48 +02:00
Laurent Destailleur
f382d8f0bb
Update actions_setnotes.inc.php 2018-08-13 23:52:33 +02:00
Laurent Destailleur
b98ee516d0
Merge pull request #9235 from grandoc/new_branch_13_08_2018 
standardize code
 2018-08-13 23:47:00 +02:00
Laurent Destailleur
b4a4ab4fa0
Merge pull request #9233 from grandoc/new_branch_12_08_2018 
standardize code
 2018-08-13 23:46:37 +02:00
Laurent Destailleur
3039e0e5ef
Merge pull request #9237 from CelineDesign/develop 
NEW #9236 Allow to import expedtion lines via API
 2018-08-13 23:44:26 +02:00
delcroix Patrick
3b9266060c Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
 2018-08-13 23:42:18 +02:00
Laurent Destailleur
e325da9339
Merge pull request #9244 from delcroip/patch-16 
Fix #9205 quote in Label/number on supplier payment
 2018-08-13 23:41:02 +02:00
Laurent Destailleur
549462574e
Merge pull request #9241 from frederic34/patch-11 
Update modules_holiday.php
 2018-08-13 23:40:05 +02:00
Laurent Destailleur
577d2d728c
Merge pull request #9238 from ptibogxiv/patch-35 
Fix dolibarr_set_const
 2018-08-13 23:39:42 +02:00
Laurent Destailleur
a866f94716 Fix package 2018-08-13 23:25:27 +02:00
Laurent Destailleur
5e762fe712 Fix cloning website switch on new web site 2018-08-13 23:22:20 +02:00
Laurent Destailleur
0ae03e78e9 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-13 23:05:46 +02:00
Laurent Destailleur
2cbbb6e622 Prepare 8.0.0 release 2018-08-13 23:04:58 +02:00
Laurent Destailleur
49ab48452a Prepare 8.0.0 release 2018-08-13 23:00:18 +02:00
delcroix Patrick
cbdd1949df
Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
 2018-08-13 20:39:20 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
0b5a87a443
Update modules_holiday.php 2018-08-13 17:25:41 +02:00
Laurent Destailleur
33f0172603 Fix select zip/town 2018-08-13 16:44:49 +02:00
Laurent Destailleur
f96dd391fa Fix error in foreign key pointing to old table 2018-08-13 16:11:23 +02:00
Laurent Destailleur
df57bd176b Fix translation 2018-08-13 14:53:04 +02:00
ptibogxiv
d0666a9583
Fix incorrect entity 2018-08-13 14:34:54 +02:00
Laurent Destailleur
b977c3a9f5 Fix translation 2018-08-13 14:04:10 +02:00
ptibogxiv
c6adeabb55
Fix dolibarr_set_const 2018-08-13 12:22:51 +02:00
Sébastien Couragier
e58c03d7b9 #9236 Allow to import expedtion lines via API 2018-08-13 11:59:55 +02:00
Philippe GRAND
e9adc9fc8e Standardize code 2018-08-13 11:25:48 +02:00
Philippe GRAND
f1f64db4dc standardize code 2018-08-13 10:20:21 +02:00
Frédéric FRANCE
5d0d8d10fc
remove superfluous spaces 2018-08-13 09:00:22 +02:00
Frédéric FRANCE
1b27cca91c
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-13 08:53:07 +02:00
Laurent Destailleur
d92096f74a Fix menu payment not required if only module bank on 2018-08-13 02:04:38 +02:00
Laurent Destailleur
6a8ed56c3d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-13 01:23:43 +02:00
Laurent Destailleur
31c42c9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/societe/canvas/actions_card_common.class.php
 2018-08-13 01:23:03 +02:00
Laurent Destailleur
7cd24c389d Fix firstname/lastname 2018-08-13 01:21:23 +02:00
Laurent Destailleur
21555a7435 Fix firstname/lastname 2018-08-13 01:10:51 +02:00
Philippe GRAND
dc3a2ac26e standardize code 2018-08-12 22:40:47 +02:00
Laurent Destailleur
d09850522b Fix migration 2018-08-12 22:27:54 +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
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +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
Frédéric FRANCE
6113b536a0
remove superfluous spaces 2018-08-12 19:59:39 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 19:54:03 +02:00
ptibogxiv
4d34725b23
Define introduce principal entity 
define which entity must be use as principal with no fee and everything else (cf stripe API)
 2018-08-12 19:42:07 +02:00
ptibogxiv
dd9751c9cf
Fix statement descriptor $soc->name 2018-08-12 19:36:41 +02:00
Laurent Destailleur
2d571acc03 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
 2018-08-12 19:25:44 +02:00