Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
45,669 Commits 36 Branches 189 Tags
1a2bde14fb2fad0fab128f25a172579c8667cb15
Commit Graph

2867 Commits

Author SHA1 Message Date
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
bf0b578e5a Fix: Sort at wrong place 
Fix: sql syntax error (field were renamed)
 2014-09-06 16:24:44 +02:00
Laurent Destailleur
522b5a91bc Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:16:24 +02:00
Laurent Destailleur
e7e48f6b2b Doxygen 
Add constant to enable bank during proposal (not enough common).
 2014-09-04 22:37:33 +02:00
Laurent Destailleur
a57e0d3505 Fix: Do not use &nbsp as value of a list 2014-09-04 19:27:59 +02:00
Florian HENRY
85cabbf921 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-04 18:29:17 +02:00
Laurent Destailleur
b88b4fbc2c Fix: bad balance of td 2014-09-04 15:17:15 +02:00
Laurent Destailleur
8ec61b8ac6 Fix: bad balance of td 2014-09-04 14:43:16 +02:00
Laurent Destailleur
32fd2e03ce More log into notify class 2014-09-04 14:38:30 +02:00
Laurent Destailleur
7021f4fb01 Fix: Message show when dir is out of sync with database cache was wrong. 2014-09-03 16:09:14 +02:00
Laurent Destailleur
ca322942ae I remove the extend into commonobjectline to common object. 
For the moment, if we need a method for line already into object, i
prefer to see method duplicated.
 2014-09-03 09:49:50 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
Laurent Destailleur
154d1520fb Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1 2014-08-30 20:36:53 +02:00
Regis Houssin
48f9ef2574 Fix: php strict mode saga 2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb Fix: php strict mode saga 2014-08-28 15:52:58 +02:00
Regis Houssin
139cf10c7c Fix: php strict mode saga 2014-08-28 15:52:20 +02:00
Regis Houssin
615122bf37 Fix: another strict mode alert 2014-08-28 15:36:57 +02:00
Regis Houssin
714da05034 Fix: another strict mode alert 2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7 Fix: another strict mode alert 2014-08-28 15:34:50 +02:00
Alexis Algoud
40aadc8125 add extrafield in add form 2014-08-26 12:11:34 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Laurent Destailleur
be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php
 2014-08-17 19:34:12 +02:00
Laurent Destailleur
4f206a2125 Fix: Missing empty field 2014-08-17 19:27:25 +02:00
Laurent Destailleur
45927cc986 Fix pb of links into state-region-country: 
- no more rowid into insert sql requests
- link, so foerign key must be on fk_region->code_region
- label was not visible
- unique keys must be into file .key.sql
 2014-08-17 17:47:25 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
c17f5e7f00 Accept property fk_thirdparty instead of fk_soc 2014-08-14 16:04:42 +02:00
Laurent Destailleur
6b26ae6f1f Fix: Header of tables must use th and not td 2014-08-14 13:30:44 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting3

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-08-14 00:59:48 +02:00
Laurent Destailleur
40349a9f53 Fix: Removed bad char 2014-08-14 00:55:27 +02:00
Laurent Destailleur
454cb1cbf8 Enhance skeleton 
Add code_iso3 into array
 2014-08-13 19:19:36 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
aspangaro
6fd77e7ef6 Merge branch 'Upstream/develop' 2014-08-11 13:26:58 +02:00
Florian HENRY
aabbc331a4 Fix output extrafield selllist 2014-08-11 13:12:04 +02:00
Florian HENRY
6849f713b5 Fix bug in output extrafields sell list 2014-08-11 13:09:35 +02:00
Laurent Destailleur
4ce2495a33 Fix: Parameter morefilter is missing. 2014-08-11 11:45:25 +02:00
Laurent Destailleur
b713bd7b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86 New: Select list of users can return user into hierarchy. 2014-08-11 11:29:47 +02:00
aspangaro
9af336b53b Add accountancy code for trips & fees and renamed libelle field into label 2014-08-10 20:41:52 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
4922071af9 New: When a translation is not available we always jump to en_US and 
only en_US.
 2014-08-08 10:50:37 +02:00
Laurent Destailleur
111d215ef1 Merge pull request #1807 from atm-maxime/develop 
New: Intervention documents are now available in ECM module
 2014-08-08 01:56:33 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Maxime Kohlhaas
3b14fa2b35 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-08-07 12:27:46 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport. 
Conflicts:
	htdocs/projet/activity/list.php
 2014-08-07 12:09:28 +02:00
Laurent Destailleur
ebc11a7a9c Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:50:25 +02:00
Laurent Destailleur
96b49cfabe Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:08:36 +02:00
Laurent Destailleur
20cef1512f Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 21:34:47 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00