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

32489 Commits

Author SHA1 Message Date
Florian Henry
f1d0879419 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-24 18:07:47 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Laurent Destailleur
65b6dca554 Fix: business rule to protect button and action was not synchronized 2013-11-24 13:46:40 +01:00
Florian Henry
6615ee7e6f [ bug #1148 ] Product consomation : supplier order bad status 2013-11-23 14:59:28 +01:00
Florian Henry
cca303cee6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-22 15:07:16 +01:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
Laurent Destailleur
6f5e78d27e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 18:42:14 +01:00
Laurent Destailleur
29e029161f Fix: Restore translation lost because entry was not set into en_US lang. 2013-11-21 18:41:06 +01:00
Florian Henry
ea0bbb5896 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 12:29:03 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user 
right allow it is OK
 2013-11-21 12:28:51 +01:00
Laurent Destailleur
0d853cf73d Fix: [ bug #1118 ] Minor problem on print page link 2013-11-21 02:49:22 +01:00
Laurent Destailleur
e63dcc5343 Fix: [ bug #1119 ] If no country is selected for a warehouse or thids 
card,
broken IMG is shown
 2013-11-21 02:14:25 +01:00
Laurent Destailleur
23f7de0873 Fix: [ bug #1094 ] Invoice Text Reminder 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:07:13 +01:00
Laurent Destailleur
35596acf40 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/product/fiche.php
 2013-11-20 23:46:33 +01:00
Laurent Destailleur
a9d5363799 Merge pull request #1313 from altairis-fr/3.3 
[Task 1144 ] Fix wrong max-length of produt ref
 2013-11-20 14:33:57 -08:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Florian Henry
306a51f6bd remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 13:54:53 +01:00
Christophe Battarel
e654dac578 [Task 1144 ] Fix wrong max-length of produt ref 2013-11-20 10:33:06 +01:00
Florian Henry
870b78fc19 [ bug #1142 ] Set paiement on invoice 2013-11-19 10:41:00 +01:00
Christophe Battarel
89a5638908 Fix bad translation on margin config 2013-11-17 12:59:33 +01:00
Laurent Destailleur
52b66a839b Merge pull request #1296 from FHenry/3.4 
Better nl_NL translation
 2013-11-15 05:06:44 -08:00
Laurent Destailleur
ef9db84a88 Merge pull request #1297 from GPCsolutions/3.4-dbupgradefix 
Sync db upgrade with db install to avoid silly upgrade errors
 2013-11-15 05:05:01 -08:00
Laurent Destailleur
a92aa14459 Merge pull request #1299 from altairis-fr/3.4 
fix wrong buy price update (confusion between entity and npr !)
 2013-11-15 05:04:07 -08:00
aspangaro
8050f8e9fe Fix problem field 2013-11-14 21:40:30 +01:00
aspangaro
e8c7bb9c62 Fix for language 2013-11-14 21:02:33 +01:00
Christophe Battarel
7dbe2bcf2c fix wrong buy price update 2013-11-13 18:41:31 +01:00
Raphaël Doursenaud
4ad5413163 Sync db upgrade with db install to avoid silly upgrade errors 2013-11-12 15:36:51 +01:00
Florian Henry
5b7f2e0c53 Better nl_NL translation 2013-11-11 17:35:36 +01:00
Laurent Destailleur
0dfbfbc19a Merge pull request #1293 from aspangaro/3.4 
Fix for document cerfa into module Don
 2013-11-10 14:58:39 -08:00
aspangaro
6b6855dff5 Fix for document cerfa into module Don 2013-11-10 06:37:08 +01:00
Laurent Destailleur
4b3778d116 Merge pull request #1292 from aspangaro/3.4 
fix for language
 2013-11-09 16:08:19 -08:00
Laurent Destailleur
4b26d8441b Fix: Entry lost 2013-11-09 12:52:06 +01:00
aspangaro
9170259351 fix for language 2013-11-09 06:51:10 +01:00
Laurent Destailleur
b82cbf1385 Fix: current balance was visible when it should not 
Conflicts:
	htdocs/compta/bank/account.php
 2013-11-06 15:35:10 +01:00
Laurent Destailleur
c7be0ee9e2 Merge pull request #1277 from grandoc/3.4 
3.4
 2013-11-04 10:41:30 -08:00
Laurent Destailleur
c41ac34356 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-11-04 15:01:31 +01:00
Laurent Destailleur
8653f3f026 Add missing Country UK. 2013-11-04 12:38:21 +01:00
Grand Philippe
59085d7331 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4 2013-11-04 10:41:32 +01:00
Grand Philippe
aaf1dd1b27 fix some language error 2013-11-04 10:41:02 +01:00
Laurent Destailleur
b2df689669 Merge pull request #1274 from FHenry/3.4 
USe good status icon for thirdparty ActivityCeased
 2013-11-03 13:18:37 -08:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
Florian Henry
6aea0bf7a1 Fix [ bug #1105 ] Searching Boxes other search option 2013-11-02 12:49:37 +01:00
Florian Henry
a4ce2d5f72 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-02 02:25:33 +01:00
Florian Henry
662f48ddc2 Use good icons 2013-11-02 02:21:45 +01:00
Laurent Destailleur
84b36d1230 Prepare for 3.4.2 2013-11-01 17:24:09 +01:00
Laurent Destailleur
ecb1f490ae Fix: Option drop tables was broken 2013-11-01 17:20:36 +01:00
Florian Henry
987c09b882 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-01 14:21:25 +01:00
Florian Henry
399093f501 USe good status icon for thirdparty ActivityCeased 2013-11-01 13:48:22 +01:00
Laurent Destailleur
4d10540600 Merge pull request #1272 from altairis-fr/rounding 
fix bad rounding on margin calculation and display
 2013-10-31 04:40:41 -07:00
Christophe Battarel
ba0273ccc4 fix bad rounding on margin calculation and display 2013-10-30 18:17:37 +01:00
Florian Henry
ad2a8d39c5 Add nl_NL margin translation 2013-10-27 13:30:35 +01:00
Florian Henry
17df92c654 Fix [ bug #1116 ] Silent Warning when validating a customer invoice 
[PostgreSQL]
 2013-10-26 16:01:02 +02:00
Florian Henry
6985a4fe3b Fix web service_contact.php civilite_id vs civility_id 2013-10-26 10:59:31 +02:00
Florian Henry
ec8cee4d41 Add link to contact webservice that is already available 2013-10-25 11:39:14 +02:00
Florian Henry
fc9752964f Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-10-25 10:02:05 +02:00
Florian Henry
c2def3d0b6 Fix bad display IE for checkbox extrafield readonly 2013-10-25 10:01:41 +02:00
Laurent Destailleur
d5d252dada Fix: [ bug #1077 ] Project card does not update vinculated third when 
modified upon refresh
 2013-10-23 18:35:18 +02:00
Laurent Destailleur
8203971614 Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated 
Conflicts:
	htdocs/filefunc.inc.php
 2013-10-23 18:33:56 +02:00
Laurent Destailleur
3050facb96 Fix: [ bug #1070 ] Accountancy code not displayed just after set 
Conflicts:
	htdocs/product/fiche.php
 2013-10-23 18:29:34 +02:00
Laurent Destailleur
cd085b3ecc Merge pull request #1256 from jfefe/cron 
Fix : use GETPOST function into CRON module
 2013-10-20 05:06:12 -07:00
Laurent Destailleur
8373982837 Merge pull request #1260 from FHenry/3.4 
restrict acces to commercial update if user can only see his own
 2013-10-20 04:14:01 -07:00
Florian Henry
e1dbee651e restrict acces to commercialupdate if user can only see his own 
thirdparty
 2013-10-19 22:08:42 +02:00
Grand Philippe
c773f21c2c fix wrong call name 2013-10-19 12:50:18 +02:00
Laurent Destailleur
4e637d3121 Fix: Sanitizing PHP_SELF 2013-10-18 17:27:17 +02:00
Laurent Destailleur
5e35731693 Add debug info to find a bug 2013-10-18 11:41:37 +02:00
Laurent Destailleur
d9106b6e85 Add debug info to find a bug 2013-10-18 11:19:32 +02:00
jfefe
ef4d3e4666 Fix : use GETPOST function into CRON module 2013-10-15 21:07:11 +02:00
Laurent Destailleur
9bc0f54ae8 Fix: set of country 2013-10-15 20:51:44 +02:00
Regis Houssin
8801d7a1eb Fix: reorder lines problem 2013-10-12 11:54:37 +02:00
Laurent Destailleur
f225b35a90 Fix: filter on warehouse 
Conflicts:
	htdocs/product/stock/mouvement.php
 2013-10-10 15:51:59 +02:00
Laurent Destailleur
41bf4d53a8 Fix: filter on warehouse 
Conflicts:
	htdocs/product/stock/mouvement.php
 2013-10-09 20:44:42 +02:00
Laurent Destailleur
e343d3bc6f Fix: missing property 2013-10-08 21:16:53 +02:00
Laurent Destailleur
8d63c2f9c5 Fix: ref_ext was not loaded 
Conflicts:
	htdocs/contact/class/contact.class.php
 2013-10-08 00:44:55 +02:00
Laurent Destailleur
91c6d47a60 Fix: Clean param 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2013-10-08 00:06:14 +02:00
Laurent Destailleur
c235c4e4ba Fix: security sql injection 2013-10-07 22:50:27 +02:00
Laurent Destailleur
ebb1dbcec3 Fix: security sql injection 2013-10-07 22:50:12 +02:00
Laurent Destailleur
123beb1e34 Fix: Bad property 2013-10-07 16:58:07 +02:00
Christophe Battarel
02278a399c better margin calculation (especially for credit notes) 2013-10-05 10:29:22 +02:00
Christophe Battarel
37e47272c7 fix bugs on margin reports 2013-10-05 10:21:38 +02:00
Laurent Destailleur
b695204259 Fix: invert parameters 2013-09-28 13:27:53 +02:00
Laurent Destailleur
7ac7034494 Merge pull request #1247 from altairis-fr/3.4 
fix bug on filter and sort
 2013-09-27 09:01:17 -07:00
Laurent Destailleur
4eb4c5f922 Some users report they need more time 2013-09-27 11:04:21 +02:00
Christophe Battarel
b7fe0cec34 fix bug on filter and sort 2013-09-26 19:05:56 +02:00
Laurent Destailleur
1f938e6596 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-25 12:16:54 +02:00
Laurent Destailleur
06f668a249 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-24 20:20:41 +02:00
Laurent Destailleur
a3e74afb02 Fix: varchar 256 2013-09-24 20:14:42 +02:00
Laurent Destailleur
a674af5bcd Fix: Permission check on event tabs 2013-09-24 11:11:59 +02:00
Laurent Destailleur
b6d5ebf81d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-24 11:02:01 +02:00
Laurent Destailleur
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
bdafcb680f Fix: Bad parameters 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-23 21:07:13 +02:00
Laurent Destailleur
8024a61376 Add missing label 2013-09-22 21:07:00 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
16396b985b Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-21 10:54:34 +02:00
Laurent Destailleur
b74f73c885 Fix: Calculation of deposit amount when using a percent was done only on 
last line.
 2013-09-21 10:53:46 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +02:00
Laurent Destailleur
369eabc69e Fix: bad condition 
Conflicts:
	htdocs/societe/societe.php
 2013-09-18 23:26:35 +02:00
Laurent Destailleur
5cbccd5fc0 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-16 13:44:37 +02:00
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice. 
Also added phpunit test to detect it if it occurs again.
 2013-09-16 13:42:42 +02:00
Laurent Destailleur
efcab8a596 Merge pull request #1237 from altairis-fr/3.4 
Fix: Supplier price displayed on document lines and margin infos didnt take discount
 2013-09-15 06:57:22 -07:00
Christophe Battarel
775d259f88 Fix: Supplier price displayed on document lines and margin infos didnt take discount 2013-09-15 14:52:41 +02:00
Laurent Destailleur
c1b6e05cc0 Fix: bad sql syntax 2013-09-15 12:46:54 +02:00
Christophe Battarel
6959ccf627 Fix: Supplier price displayed on document lines didnt take discount 2013-09-15 11:41:41 +02:00
Laurent Destailleur
914e167183 Fix: Bad sql request 2013-09-14 14:34:45 +02:00
Laurent Destailleur
443eba900a Fix: Bad translation 2013-09-14 12:52:04 +02:00
Laurent Destailleur
707bba3d7d Fix: W3C 2013-09-13 10:40:49 +02:00
Laurent Destailleur
54976951a1 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7 Fix: Missing sources 
Fix: packager
 2013-09-12 23:47:36 +02:00
simnandez
817569d487 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:54:47 +02:00
Laurent Destailleur
899c209468 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-11 23:10:54 +02:00
Laurent Destailleur
6f2652f2b6 Fix: Use correct standard 2013-09-11 23:07:47 +02:00
Laurent Destailleur
301187a117 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
 2013-09-11 21:54:57 +02:00
Laurent Destailleur
d6c35c1ee7 Fix: Opensource rules violation (sources must be included with lib) 2013-09-11 21:39:33 +02:00
Laurent Destailleur
2db0a56b17 Merge pull request #1225 from jfefe/fix_ws_order 
Fix : missing lib / bad property name in order webservice
 2013-09-10 02:44:22 -07:00
jfefe
5abbee02c8 Fix : missing lib / bad property name in order webservice 2013-09-10 11:23:36 +02:00
simnandez
43beb38c9b Fix: [ bug #1061 ] Bad info shipped products 2013-09-10 11:04:36 +02:00
Laurent Destailleur
2b8af33505 Fix: eof 2013-09-09 19:15:34 +02:00
jfefe
13e235ca8a Fix: permission check in invoice webservice 
remove comment & indent code
 2013-09-09 17:08:22 +02:00
Laurent Destailleur
afe58abdcd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-09-08 21:51:37 +02:00
Christophe Battarel
9fa37fc5f1 Fix: Edit propal line was losing product supplier price id 
Conflicts:
	ChangeLog
 2013-09-08 21:51:08 +02:00
Laurent Destailleur
2d354de549 Merge pull request #1211 from FHenry/3.4 
Fix: Delete linked element to supplier invoice when deleted (as done for
 2013-09-06 13:49:27 -07:00
Laurent Destailleur
651596e8d5 Fix: missing ; 2013-09-06 13:42:14 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Florian Henry
2740cc78b6 Add dol_syslog 
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
 2013-09-05 17:45:30 +02:00
Florian Henry
95ff16f145 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-05 17:39:49 +02:00
Laurent Destailleur
e40d644085 Fix: Remove warning 2013-09-04 16:49:20 +02:00
Laurent Destailleur
af22d38681 Fix: Bad total without tax 2013-09-04 15:07:35 +02:00
Laurent Destailleur
b1c25d91cd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
aspangaro
91320ef99c Update translation fr_FR 2013-09-04 05:17:33 +02:00
Florian Henry
ddeca06f32 Real ref filter 2013-09-03 21:13:05 +02:00
Florian Henry
cb86cd403c Fix: Delete linked element to supplier invoice when deleted (as done for 
all other object into dolibarr)
 2013-09-03 20:01:10 +02:00
simnandez
83042459a5 Fix: compatiblity with multicompany module 2013-09-02 10:07:44 +02:00
Laurent Destailleur
b95aa1ac7b Fix: select list on external table 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-09-02 00:41:14 +02:00
simnandez
b86e20f0e6 Fix: Intervention box links to contracts id 2013-08-29 12:05:29 +02:00
simnandez
fa4a9c73c4 Fix: Localtaxes balance not showing 2013-08-29 09:58:07 +02:00
Laurent Destailleur
e741ce9ea2 Merge pull request #1201 from FHenry/3.4 
Fix: Mailing module : if an email is already in destinaires list all
 2013-08-28 07:41:01 -07:00
Florian Henry
cc90c92cc0 Fix: Mailing module : if an email is already in destinaires list all 
other email from selector was not inserted
 2013-08-28 16:33:21 +02:00
Laurent Destailleur
cfa7b6ead9 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-08-28 13:13:22 +02:00
Laurent Destailleur
b39046ca7e Fix: Add missing syslog 2013-08-28 13:05:14 +02:00
simnandez
dfd14f4430 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:44:00 +02:00
Laurent Destailleur
9cf2d8c556 Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter 
Update parameter as expected by the function name
 2013-08-26 14:12:30 -07:00
Raphaël Doursenaud
dcc87263d0 Update parameter as expected by the function name 2013-08-26 18:26:11 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete 
service
 2013-08-26 14:39:35 +02:00
Laurent Destailleur
cafd75ac4a Revert a bad fix. 2013-08-24 21:55:02 +02:00
Laurent Destailleur
1c08cad6b9 Fix: Bad translation (to pick to 3.4) 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2013-08-24 21:41:36 +02:00
Laurent Destailleur
1c527b8db9 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-24 20:59:02 +02:00
simnandez
c242d66530 Fix: [ bug #1039 ] Pre-defined invoices conversion 2013-08-23 18:03:16 +02:00
Christophe Battarel
edf7af444c fix margin reports bugs (wrong group by + jquery syntax error) 2013-08-23 09:10:15 +02:00
Christophe Battarel
ecdce9ddf6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4 2013-08-23 09:07:10 +02:00