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

49855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
All-3kcis
ccf144dbae Correct hook param name 
$object => $product
 2015-10-16 16:15:51 +02:00
Laurent Destailleur
ebdc402832 No value set when using the generic new thirdparty feature 2015-10-16 15:05:05 +02:00
Laurent Destailleur
dc5cc52395 NEW Merge all search fields of an area page into one search box 2015-10-16 10:52:49 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
b43047bc2f Use the new banner on all tabs of contacts 2015-10-15 14:13:31 +02:00
Laurent Destailleur
8a32041f16 Clean CSS when option MAIN_MAXTABS_IN_CARD is set 2015-10-15 13:31:44 +02:00
Laurent Destailleur
e79fe7401f Merge pull request #3741 from fmarcet/3.8 
FIX #3689 Bug on workflow module
 2015-10-15 13:09:43 +02:00
Laurent Destailleur
577776b950 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-15 12:19:01 +02:00
Laurent Destailleur
e2478eea07 NEW Increase length of bank code to 128 char #3704 2015-10-15 12:18:17 +02:00
fmarcet
4cdf17d8b5 FIX #3689 Bug on workflow module 2015-10-15 12:17:57 +02:00
Laurent Destailleur
7fe92bdf0a Merge pull request #3722 from GPCsolutions/zenfusion-23 
[Qual] Use default data root path if no conf
 2015-10-15 12:06:04 +02:00
Laurent Destailleur
cee0364a1a Merge pull request #3714 from marcosgdf/doactions-usercard 
NEW Add doActions hooks to user card
 2015-10-15 12:05:26 +02:00
Laurent Destailleur
ff1f7f1a48 Merge pull request #3739 from GPCsolutions/3.8-3728 
Fix #3728 Properly remove last category
 2015-10-15 12:00:22 +02:00
Raphaël Doursenaud
6c2b46f939 Fix #3728 Properly remove last category 2015-10-15 10:15:37 +02:00
Laurent Destailleur
d27330e012 Removed useless info 2015-10-15 03:38:21 +02:00
Laurent Destailleur
e413eb29c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-15 03:29:47 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
Laurent Destailleur
e22b0b9a57 More complete PHPunit test 2015-10-14 22:36:32 +02:00
Laurent Destailleur
00c8b27baf Add code comment 2015-10-14 22:04:54 +02:00
Laurent Destailleur
ed4013bb31 Merge pull request #3735 from All-3kcis/develop-patch-8 
Update function, move commit after trigger in categorie.class.php
 2015-10-14 21:42:09 +02:00
Laurent Destailleur
05686b532c Merge pull request #3733 from fappels/3.8-shipment-lot-delete 
FIX: #3605 deleting a shipping
 2015-10-14 21:41:20 +02:00
Laurent Destailleur
df3639957d Merge pull request #3732 from hregis/develop_origin 
Fix: compatibility with dolibarr versions before and after 3.7.1
 2015-10-14 21:32:58 +02:00
Laurent Destailleur
5d585fa04a Merge pull request #3729 from FHenry/3.7 
FIX : #3724 Bug: Blank page after cloning proposal with changed client
 2015-10-14 21:32:26 +02:00
Laurent Destailleur
a5b9a210ce Merge pull request #3725 from FHenry/3.8 
FIX : #3724 Bug: Blank page after cloning proposal with changed client
 2015-10-14 21:27:58 +02:00
Laurent Destailleur
f08d52b0e8 Merge pull request #3723 from atm-alexis/FIX_double_escape_entrepot 
FIX double db escape add too quote
 2015-10-14 21:27:39 +02:00
Laurent Destailleur
e9aed15bed Work on the feature to select which field to show 2015-10-14 18:48:03 +02:00
Laurent Destailleur
225313d8ac NEW Introduce hidden option MAIN_LANDING_PAGE to decide the home page 
visible just after login.
 2015-10-14 17:18:26 +02:00
Laurent Destailleur
ca991da312 Introduce usebold variable to allow more option on style in future. 2015-10-14 16:51:20 +02:00
All-3kcis
545f043353 Move db->commit after trigger 2015-10-14 16:24:09 +02:00
fappels
68aac4476c FIX: #3605 deleting a shipping 
Get lots to move back to stock.
Move lots back to stock.
Do not log object because it will be deleted
Improve error reporting
 2015-10-14 12:16:54 +02:00
Regis Houssin
309535c260 Merge branch 'develop' into develop_origin 2015-10-14 12:12:05 +02:00
Regis Houssin
542ed40c9c Fix: compatibility with dolibarr versions before and after 3.7.1 2015-10-14 12:09:51 +02:00
Laurent Destailleur
e9facbf108 FIX bad property so after creating an event from calendar, filter were 
lost.
 2015-10-14 10:53:38 +02:00
Florian HENRY
6b8707516e FIX : skeleton class must use db->order rather than ORDER BY into 
fetchAll
 2015-10-14 10:05:42 +02:00
fappels
1a0ad2d1c9 Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8 2015-10-14 09:40:47 +02:00
Florian HENRY
727db56576 FIX : #3724 Bug: Blank page after cloning proposal with changed client 2015-10-14 08:27:56 +02:00
Florian HENRY
00b610d87f FIX : fix HTML into formconfirm box 2015-10-14 08:23:52 +02:00
Laurent Destailleur
57ea4fc23d FIX sql syntax error when sort order not defined. 2015-10-13 14:40:02 +02:00
Laurent Destailleur
70f3da80df FIX Option SOCIETE_DISABLE_PROSPECTS not supported into title of box 2015-10-13 14:21:00 +02:00
Laurent Destailleur
6520ed7a08 Use css not bold title. 
Add missing badge (count of draft records) on draft list.
 2015-10-13 14:09:14 +02:00
Laurent Destailleur
9f0c0bfc92 NEW Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple 
replacement of translated string on the fly.
 2015-10-13 13:27:44 +02:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Laurent Destailleur
918d9b7c18 Fix filter was lost if nothing found 2015-10-13 12:05:24 +02:00
Marcos García de La Fuente
87ad6e7941 Merge branch 'develop' into doactions-usercard 
# Conflicts:
#	htdocs/user/agenda_extsites.php
 2015-10-13 09:49:19 +02:00
Florian HENRY
8aaa1993c6 FIX : #3724 Bug: Blank page after cloning proposal with changed client 2015-10-13 09:37:33 +02:00
Alexis Algoud
0251728e28 FIX double db escape add too quote 2015-10-12 17:36:24 +02:00
Raphaël Doursenaud
ddb23eaf3b [Qual] Use default data root path if no conf 
Installation can be protected by an install.lock file in the
data root path. This protection was ineffective if no configuration
file was available. Whith this change, it still searches the default
path.
 2015-10-12 15:25:36 +02:00
Laurent Destailleur
618e5f0419 FIX no need to remove file into mail form #3573 2015-10-11 20:47:31 +02:00