lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,425 Commits 43 Branches 150 Tags 886 MiB
4e23a21225
Commit Graph

40425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
4e23a21225 Merge branch 'upstream/develop' 2014-02-03 22:08:54 +01:00
Laurent Destailleur
8f3e9b1832 Fix: function must return a string 2014-02-03 20:05:56 +01:00
Laurent Destailleur
89ebb3c0ef New: Add option MAIN_DISABLE_AJAX_COMBOX 2014-02-03 19:47:35 +01:00
Laurent Destailleur
efcff80a28 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/control
	htdocs/fourn/facture/paiement.php
 2014-02-03 18:44:48 +01:00
Laurent Destailleur
e5cd32623c Qual: Uniformize code of payment between customer and supplier payments. 
New: Add warning if supplier payment is higher that due amount.
 2014-02-03 18:42:24 +01:00
Laurent Destailleur
2b2d764180 Fix: ref and date of supplier invoice. 
Fix: Check on bank account
 2014-02-03 17:30:35 +01:00
Laurent Destailleur
70c262a99f Avoid duplicate a2en. 
No pass into log.
 2014-02-02 19:19:41 +01:00
Laurent Destailleur
77b3c9d2eb Fix: Bad constant 2014-02-02 19:00:56 +01:00
aspangaro
de3f680899 Update copyright 2014-02-02 18:37:55 +01:00
aspangaro
bccf23711d Kill clics - Accountancy in product card - Not display accountancy_code when module (comptabilite | accounting | accounting expert) is disabled 2014-02-02 18:26:17 +01:00
Laurent Destailleur
ad0e78a56a Fix: debian and ubuntu package 2014-02-02 16:29:56 +01:00
Laurent Destailleur
8768ece9f7 Fix for ubuntu compatibility 2014-02-02 15:46:22 +01:00
Laurent Destailleur
4c60873d06 Fix: not dependencies by default to be compatible with all distrib. 2014-02-02 14:57:55 +01:00
Laurent Destailleur
873d44e2c0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-02 14:18:43 +01:00
Laurent Destailleur
18f8c80b98 Fix: lintian warning in date 2014-02-02 13:59:38 +01:00
aspangaro
05c8039cf9 Delete rowid in case of an other accountancy plan already exist. 2014-02-02 09:50:53 +01:00
aspangaro
fda0dec260 Add The base accountancy belgium plan for accounting - Thanks delcroip 
http://www.dolibarr.fr/forum/12-howto--aide/47966-pcmn-plan-comptable-minimum-normalise-belgique
 2014-02-02 06:45:05 +01:00
Laurent Destailleur
2d15e2c759 Fix: Link on supplier in document invoice must go to supplier card. 2014-02-01 16:31:23 +01:00
Laurent Destailleur
7de0438299 Fix: Link on supplier in document invoice must go to supplier card. 2014-02-01 16:26:41 +01:00
Laurent Destailleur
6896ce0daa Merge pull request #1402 from defrance69/patch-29 
Update commonobject.class.php
 2014-02-01 05:00:03 -08:00
BENKE Charles
b86322c14a Update commonobject.class.php 
hook module need extrafields parameter too
 2014-02-01 12:55:05 +01:00
Laurent Destailleur
ba931e18d4 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-31 18:12:54 +01:00
Laurent Destailleur
40a53d4b57 Fix: used bad constant name 2014-01-31 16:06:28 +01:00
Laurent Destailleur
28b252849f Fix: W3C 2014-01-31 13:02:48 +01:00
Laurent Destailleur
7f15aa4582 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
 2014-01-31 10:12:41 +01:00
Laurent Destailleur
5b218c3c5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-01-31 10:10:38 +01:00
Laurent Destailleur
bb7fc8631b Qual: Uniformize index name to match 
http://wiki.dolibarr.org/index.php/Language_and_development_rules#SQL_rules
 2014-01-31 10:08:25 +01:00
Laurent Destailleur
a2afea7ba9 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-30 18:21:04 +01:00
Laurent Destailleur
c5d5d6a8d6 A better fix to have default statut to enabled when created an address. 2014-01-30 18:17:52 +01:00
Laurent Destailleur
d15aeb268f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-30 18:12:31 +01:00
Laurent Destailleur
47ff6a68bb Fix: Test were inverted. 2014-01-30 18:11:40 +01:00
simnandez
17581dd6d6 Fix: Default status into contact creation must be Actif 2014-01-30 12:21:58 +01:00
simnandez
ee72a9a4e6 Fix: Default status into contact creation must be Actif 2014-01-30 12:20:36 +01:00
Laurent Destailleur
85436f871c Sec: Missing permission tests 2014-01-30 11:48:14 +01:00
Laurent Destailleur
0e9477167d Fix: Bad output of extrafields when list is used. 2014-01-30 11:47:25 +01:00
Laurent Destailleur
8abde9e11f Sec: Missing permission tests 2014-01-30 11:44:31 +01:00
Laurent Destailleur
5076e8ce4e Fix: Bad output of extrafields when list is used. 2014-01-30 10:48:10 +01:00
Laurent Destailleur
8d86778a66 Merge pull request #1400 from jfefe/fix_migr 
Fix : bad sql request during migration
 2014-01-29 16:52:52 -08:00
Laurent Destailleur
470f88bacd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-30 01:43:44 +01:00
Laurent Destailleur
16811a6077 Move changelog from 3.5 to 3.6 to remind there is still work to do. 2014-01-30 01:43:30 +01:00
Laurent Destailleur
35ddcf2958 Remove from changelog because feature is not stable. 2014-01-30 01:42:32 +01:00
Laurent Destailleur
bd3a64d580 Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on 
detailed lines because this feature is currently bugged.
Should work when the 2 forms (predefined product and free product) will
be merged into one (planned for 3.6)
 2014-01-30 01:35:01 +01:00
Laurent Destailleur
d6c4fa5fe3 Qual: Normalize code 2014-01-30 00:40:00 +01:00
Jean-François Ferry
a0c3527e30 Fix : bad sql request during migration 2014-01-29 19:19:23 +01:00
Laurent Destailleur
74e376fa78 Merge pull request #1399 from defrance69/patch-27 
Update objectline_add.tpl.php
 2014-01-29 08:10:34 -08:00
Laurent Destailleur
1de5cb18f9 Merge pull request #1397 from FHenry/3.5 
Add complete head into agenda
 2014-01-29 08:00:28 -08:00
BENKE Charles
a10ccb4d92 Update objectline_add.tpl.php 
Adding extra fields on line of element
 2014-01-29 16:45:37 +01:00
Florian Henry
779aaa51ab reset function2.lib.php to orign 2014-01-29 10:13:00 +01:00
Florian Henry
526c383f10 Add complete head into agenda 2014-01-29 10:11:39 +01:00