lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,651 Commits 43 Branches 150 Tags 886 MiB
6dddcbfe49
Commit Graph

42651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f25bb79d80 Merge pull request #1672 from defrance69/patch-19 
Add project and task boxes
 2014-06-26 22:03:38 +02:00
Laurent Destailleur
534e574379 Merge pull request #1668 from aspangaro/develop-dons 
Move donation receipt to french model cerfa 11580*03
 2014-06-26 22:03:13 +02:00
Laurent Destailleur
656dd94011 Merge pull request #1657 from mkdgs/patch-1 
Add customers/supplier status fo contact export
 2014-06-26 21:58:23 +02:00
Laurent Destailleur
722847cbe6 Add option to enable keypad (in most cases, we don't need this). 2014-06-26 21:57:49 +02:00
Laurent Destailleur
e2790895ad Prepare 3.7 development. 2014-06-26 21:48:57 +02:00
Laurent Destailleur
b1f858a461 Merge pull request #1644 from defrance69/patch-18 
Patch 18
 2014-06-26 21:45:10 +02:00
Laurent Destailleur
79dec7ad90 Merge pull request #1641 from defrance69/patch-17 
Patch 17
 2014-06-26 21:43:45 +02:00
Laurent Destailleur
f336becdb3 Merge pull request #1635 from aspangaro/develop-accounting 
Chart of accounts BE PCMN-BASE - Account_parent must be an int.
 2014-06-26 21:42:22 +02:00
Laurent Destailleur
a2f610ffbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-06-26 21:41:45 +02:00
Laurent Destailleur
93611e6e5b Merge branch 'FHenry-develop' into develop 2014-06-26 21:38:24 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
31c60cc8ce Merge pull request #1613 from guerinaxel/patch-4 
Adding var mode_reglement_id to facture
 2014-06-26 21:25:01 +02:00
Laurent Destailleur
0b38fcb830 Merge pull request #1604 from atm-alexis/develop_add_delivery_column_on_supplier_order 
Develop - add delivery column on supplier order
 2014-06-26 21:13:20 +02:00
Laurent Destailleur
abfe36620a Merge pull request #1686 from KreizIT/movetrig 
Fix [ bug #1459 ]
 2014-06-26 21:01:48 +02:00
Laurent Destailleur
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +02:00
Laurent Destailleur
72d1a9606e Merge pull request #1688 from GPCsolutions/3.5-databaseprefix 
Fix database prefix usage
 2014-06-26 20:58:36 +02:00
Laurent Destailleur
2deadea40a New: Filter on event status 2014-06-26 20:24:00 +02:00
Raphaël Doursenaud
f5980a1d20 Fix database prefix usage 2014-06-26 15:52:31 +02:00
Laurent Destailleur
2b93380ab0 Syn pt_BR from transifex 2014-06-26 01:51:17 +02:00
Laurent Destailleur
012d2c2a9e Syn pt_BR from transifex 2014-06-26 01:50:49 +02:00
Laurent Destailleur
430f8ad619 Merge remote-tracking branch 'origin/3.6' into develop 2014-06-25 20:23:28 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Laurent Destailleur
1e6e5da925 Fix: sql syntax error (missing ' on date) 2014-06-25 20:07:54 +02:00
Laurent Destailleur
018771c0f5 Fix: sql syntax error (missing ' on date) 2014-06-25 20:07:21 +02:00
KreizIT
92f1778c9d Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error 
Start refactoring trigger call from within object
 2014-06-25 16:51:26 +02:00
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Laurent Destailleur
289a7ecf14 Merge remote-tracking branch 'origin/3.6' into develop 2014-06-25 08:53:55 +02:00
Laurent Destailleur
ffd27f2d49 Fix: Translation 
Fix: pgsql pb
 2014-06-25 08:52:57 +02:00
Laurent Destailleur
f64f0d6933 Fix: If showempty is 0 and empty, do not show button. 2014-06-24 23:43:53 +02:00
Laurent Destailleur
54f55cf03e Fix: No change if error on trigger 2014-06-24 22:14:45 +02:00
Laurent Destailleur
1db9514fed Fix: When an invoice is replaced with another, amount must not appears 
on total for project
 2014-06-24 22:02:56 +02:00
Laurent Destailleur
396012f7e7 Fix: When an invoice is replaced with another, amount must not appears 
on total for project
 2014-06-24 15:37:10 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
0c382ef97e Remove failure test on trigger 2014-06-24 10:55:21 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
aspangaro
56785f1149 Merge branch 'Upstream/develop' 2014-06-24 06:10:47 +02:00
aspangaro
865d853af8 Add migration file to 3.7 & update llx_c_paiement 2014-06-24 06:02:17 +02:00
aspangaro
3612fb02bc Merge branch 'Upstream/develop' 2014-06-24 05:50:16 +02:00
aspangaro
54a79c2b34 Merge branch 'Upstream/develop' 2014-06-24 05:48:40 +02:00
Laurent Destailleur
a94b78958f Merge pull request #1679 from defrance69/patch-1 
Update entrepot.class.php
 2014-06-23 20:28:53 +02:00
Laurent Destailleur
5303e34797 Merge pull request #1680 from marcosgdf/vagrant 
Updated Vagrant box
 2014-06-23 20:21:39 +02:00
Laurent Destailleur
04ead87aea Merge pull request #1681 from KreizIT/FIX1485 
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
 2014-06-23 20:20:31 +02:00
Cedric
7ced580abc Add fix to changelog 2014-06-23 12:35:37 +02:00
Marcos García de La Fuente
4b3be7bc9a Removed support to PHPmyAdmin 2014-06-23 12:30:24 +02:00
Cedric
0f267559c6 FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop 2014-06-23 12:28:59 +02:00
Marcos García de La Fuente
69ddac78cb Updated .gitignore and README with new versions 2014-06-23 12:01:04 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Marcos García de La Fuente
e6da3d94ba Updated PuPHPet vagrant box to latest version 2014-06-23 11:28:59 +02:00
Laurent Destailleur
75d9e950c2 Fix: Another column visible when it shouldn't (field has been removed 
and is no more updated by dolibarr).
 2014-06-23 10:10:18 +02:00
Laurent Destailleur
dae7f8643b Transifex sync 2014-06-22 23:37:20 +02:00