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

3959 Commits

Author SHA1 Message Date
Regis Houssin
c3e245d24e Fix: start triggers before delete objects 2012-02-15 15:16:33 +01:00
Laurent Destailleur
e178077e1e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/compta/bank/ligne.php
 2012-02-15 12:22:18 +01:00
Laurent Destailleur
c89fd4b1e7 New: Can conciliate several lines in one operation. 2012-02-15 12:16:33 +01:00
Laurent Destailleur
8eaf9602d9 Fix: If choice was forced to another value by user, we must keep choice of user 2012-02-13 20:12:03 +01:00
Regis Houssin
6f3f1204fe Fix: delete linked object in propal delete function and uniformize code 2012-02-13 18:27:42 +01:00
Regis Houssin
f07b6397fc Fix: test if type of paiement is cash for cash account 2012-02-13 15:18:23 +01:00
Regis Houssin
c86183e18c Fix: uniformize code and force paiement type if cash account 2012-02-13 14:49:20 +01:00
Laurent Destailleur
cfaf1f0813 New: Can add tabs on statistics views. 2012-02-12 23:29:31 +01:00
Laurent Destailleur
8f4c5eeb9e Fix: Stats must be on user of card not creator 2012-02-12 11:52:01 +01:00
Laurent Destailleur
d48fd7b232 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-11 20:30:46 +01:00
Laurent Destailleur
2fd870d987 Normalize code 2012-02-11 20:30:16 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Laurent Destailleur
d9cd816b3c Qual: Merge month.php and index.php page 
Prepare for adding statistics page into new tabs.
 2012-02-11 00:11:49 +01:00
Laurent Destailleur
df7dc8652d Look: Uniformize css style usage 2012-02-10 09:54:19 +01:00
Laurent Destailleur
c1600bc4fa Minor fix 2012-02-10 09:16:38 +01:00
Laurent Destailleur
186258410e New: Add option to clean orphelins files into repair page 2012-02-08 16:41:06 +01:00
Laurent Destailleur
104a4532b9 Fix: miscellaneous not initialized vars 2012-02-07 18:48:50 +01:00
Regis Houssin
6a43a517f1 Fix: add deleteObjectLinked function 2012-02-07 16:47:46 +01:00
Regis Houssin
f0d2823edf Fix: avoid foreach warning 2012-02-06 18:59:07 +01:00
Laurent Destailleur
6cb0685b6f Qual: Uniformize hook names. All hooks to add information on 
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
 2012-02-06 17:18:19 +01:00
Laurent Destailleur
866e8ac556 First change to prepare usage of native PHP functions for date instead 
of adodb-time library.
 2012-02-05 15:13:31 +01:00
Laurent Destailleur
26c597878f Amount at end. 2012-02-03 10:00:57 +01:00
Regis Houssin
3302a86f0c Fix: add entity field in llx_paiement 2012-02-01 18:29:06 +01:00
Laurent Destailleur
0a78b3f970 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 14:22:35 +01:00
Laurent Destailleur
f1cd91dac5 Fix: Permission on donation module 2012-02-01 14:20:22 +01:00
Laurent Destailleur
b1e58dd454 Mutualize common code 2012-02-01 13:21:39 +01:00
Regis Houssin
c6e4206907 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
f3a966a313 Fix: Missing name 2012-01-29 23:24:47 +01:00
Laurent Destailleur
82e5aad8f1 Fix: Usage of not defined var 2012-01-26 13:54:17 +01:00
Laurent Destailleur
070f157f08 Fix: Delete bank account 2012-01-19 23:31:37 +01:00
Laurent Destailleur
d9aa0c4b28 Qual: Normalize field names 2012-01-19 22:20:28 +01:00
Laurent Destailleur
a754072c85 Fix: use correct property 2012-01-18 01:31:57 +01:00
Laurent Destailleur
a8ca1c721c Uniformize way of working of trip and expenses (added "validate" step 
after "draft").
 2012-01-18 01:05:26 +01:00
Spangaro Alexandre
28550dca89 Add function block/unblock for a trip credit note 
Signed-off-by: Spangaro Alexandre <alexandre.spangaro@gmail.com>
 2012-01-17 15:11:04 +08:00
Christophe Battarel
6a90298af0 affiche libellé produit dans la langue du client en plus de la description (variable de conf renommée en PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE 2012-01-16 17:12:29 +01:00
Christophe Battarel
5524d42ddb ajout commentaires entete oubliés sur ajout description produit dans la langue du client 2012-01-16 10:35:36 +01:00
Laurent Destailleur
f1c2c7891b Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-15 19:09:26 +01:00
Laurent Destailleur
15cd3794c9 Removed comments 2012-01-15 15:16:06 +01:00
Regis Houssin
196bb42636 Fix: use MAIN_JS_ON_PAYMENT just for the auto-completion payment 2012-01-15 11:02:08 +01:00
Laurent Destailleur
e528ac97a8 fix: [ bug #272 ] Impossible afficher Créances-Dettes sur période 
d'analyse choisie
 2012-01-14 13:45:42 +01:00
Laurent Destailleur
580f2ef375 Look: Minor fix 2012-01-14 12:38:03 +01:00
Laurent Destailleur
7950ab2677 Fix: Avoid duplicate line 2012-01-14 01:13:24 +01:00
Regis Houssin
9fe45c4f4f Fix: uniform code 2012-01-13 17:46:15 +01:00
Christophe Battarel
69c9edbeb3 ajoute la possibilité de visualiser la description des produits dans la langue du client lors de l'jout de lignes dans les commandes/propales/factures 2012-01-13 16:53:28 +01:00
Laurent Destailleur
851abe00a9 New: Can attach files on social contributions 2012-01-11 20:31:40 +01:00
Laurent Destailleur
a57295cc73 Qual: Add phpunit test before working on different rounding modes 2012-01-11 16:35:12 +01:00
Laurent Destailleur
2b9a118384 Fix: Bad date init 2012-01-11 13:47:47 +01:00
Laurent Destailleur
5fc760d318 Doxygen 2012-01-10 09:57:16 +01:00
Laurent Destailleur
6a5218b9b2 Qual: Ckeckstyle 2012-01-10 01:31:06 +01:00
Laurent Destailleur
f6de981ed9 Removed useless number 2012-01-08 23:44:09 +01:00
Laurent Destailleur
77870d0557 Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS 2012-01-08 23:43:32 +01:00
Laurent Destailleur
159417898e Removed non utf8 chars 2012-01-08 17:29:26 +01:00
Laurent Destailleur
4c0d7378d3 Some change to prepare artichow removal 2012-01-07 21:32:35 +01:00
Laurent Destailleur
9e065b2395 New: Dolgraph function works with jflot (use DOL_MAIN_GRAPH=artichow to 
use old libraries)
 2012-01-07 20:56:52 +01:00
Laurent Destailleur
3f8d2cbef8 Qual: Remove checkstyle warnings 2012-01-04 21:23:50 +01:00
Laurent Destailleur
785f5b3c46 Doxygen 2012-01-04 14:17:32 +01:00
Laurent Destailleur
82fd755919 Look: Increase field size 2012-01-02 14:26:47 +01:00
Laurent Destailleur
8444a290e7 Do not show paypal link if invoice is draft 2011-12-31 14:26:03 +01:00
Laurent Destailleur
efd5f5eaa4 Look: Add line "None" when there is no bank account 2011-12-30 00:33:34 +01:00
Laurent Destailleur
7688e44b2a Uniformize field country_id, country_code, country 2011-12-29 18:34:56 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
Laurent Destailleur
43964552bf Add a TODO 2011-12-22 09:07:02 +01:00
Laurent Destailleur
aa2a45db87 New: Add a tab info for social contributions 2011-12-21 21:14:10 +01:00
Laurent Destailleur
79c07397d6 Fix: Lang loaded 2011-12-21 20:34:10 +01:00
Laurent Destailleur
cda132ea8c Qual: Some change to have graph lib able to use img disk generation 
libraries like javascript libraries.
 2011-12-17 15:55:49 +01:00
Juanjo Menent
71979a8c86 Qual: Uniformize code 2011-12-16 16:31:18 +01:00
Laurent Destailleur
c701eacbce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2011-12-14 10:07:24 +01:00
Laurent Destailleur
730690bd01 W3C 2011-12-14 09:58:55 +01:00
Laurent Destailleur
1e76d296ae Qual: Mutualize code 2011-12-13 01:10:07 +01:00
Regis Houssin
a5fc434770 Fix: remove unused parameters 
Fix: use dol_clone instead fetch
 2011-12-12 14:04:03 +01:00
Laurent Destailleur
55bce13bfb Qual: Removed deprecated functions 2011-12-12 01:39:55 +01:00
Laurent Destailleur
27cd74eaea New: Add hidden option MAIN_LIST_FILTER_ON_DAY 2011-12-08 01:45:38 +01:00
Laurent Destailleur
ebea7f6c97 Fix: fix not initialized variables 2011-12-05 18:36:54 +01:00
Laurent Destailleur
e6f3599847 Qual: Some code cleaning 2011-12-04 22:25:49 +01:00
Laurent Destailleur
eee21dd644 Fix: Missing deposits 2011-12-03 15:30:58 +01:00
Laurent Destailleur
0c2451e4fa Doxygen 2011-12-03 15:30:40 +01:00
Laurent Destailleur
010964ad54 Fix: Warning always visible 2011-12-03 15:21:33 +01:00
Laurent Destailleur
7f3c336b7b Clean invoice class and enhance phpunit tests 2011-12-03 15:12:18 +01:00
Laurent Destailleur
11727d68b8 Fix: update was not included into pdf generation 2011-12-02 19:57:20 +01:00
Laurent Destailleur
1c65768286 Fix: flot graph works with new json_encode 2011-12-01 22:58:32 +01:00
Laurent Destailleur
56a0e26465 Fix: Removed tons of warnings 2011-12-01 17:09:01 +01:00
Laurent Destailleur
70ab87c210 Qual: Mutualize link to paypal 2011-11-30 19:42:08 +01:00
Laurent Destailleur
f79890b527 New: Add link to paypal payment page 2011-11-30 18:48:37 +01:00
Laurent Destailleur
0080c07c18 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-25 23:36:07 +01:00
Regis Houssin
ad6705977b Fix: XSS injection 2011-11-25 17:35:01 +01:00
Regis Houssin
2ce2c94f5d Fix: XSS injection 2011-11-25 17:12:39 +01:00
Regis Houssin
3fb1db1cf2 Fix: XSS injection 2011-11-25 16:47:57 +01:00
Regis Houssin
be0ed900bc Fix: translation 2011-11-24 09:16:21 +01:00
Laurent Destailleur
ace1345755 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-23 23:26:27 +01:00
Regis Houssin
86a48c8962 Fix: change the last database prefix 2011-11-23 21:43:25 +01:00
Regis Houssin
00ffbd5e90 Fix: change the last database prefix 2011-11-23 21:25:02 +01:00
Laurent Destailleur
f36b78444b Add space line 2011-11-23 19:59:23 +01:00
Laurent Destailleur
35425fe1c4 Doxygen 2011-11-23 19:58:03 +01:00
Laurent Destailleur
71e0f825b2 New: Add box for expired services 2011-11-23 18:10:10 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
Laurent Destailleur
31f198fa79 Clean invoice class from deprecated fields. 
Enhance initAsSpeciment function to contains all kind of lines.
 2011-11-23 13:39:55 +01:00
Laurent Destailleur
1770a46519 Qual: Removed tons of warning 2011-11-22 14:00:03 +01:00
Laurent Destailleur
ded3e4efad Fix: pgsql compatibility 2011-11-22 02:15:58 +01:00
Laurent Destailleur
443e8d1710 Add test to avoid bad input 2011-11-22 00:19:57 +01:00
Regis Houssin
bb8aa45253 Fix: duplication result problem 2011-11-20 18:45:55 +01:00
Regis Houssin
065d7996f5 Fix: better with json_encode 2011-11-20 15:25:08 +01:00
Laurent Destailleur
117fb7001b Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-19 19:15:52 +01:00
Laurent Destailleur
3699f13454 Fix: [ bug #233 ] Delete invoice problem with a discount 2011-11-19 19:05:33 +01:00
Regis Houssin
0207191202 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-19 09:45:44 +01:00
Regis Houssin
7a34f4d5e4 Fix: remove duplicate field 2011-11-19 09:45:01 +01:00
Laurent Destailleur
51d30c41a7 Fix: Correct sign 2011-11-18 13:08:51 +01:00
Laurent Destailleur
f60b664c16 Fix: Correct sign on line 2011-11-18 02:16:35 +01:00
Laurent Destailleur
bf9c482f8a Fix: Deposits was not included into lines but into into remain to pay 2011-11-16 18:58:11 +01:00
Laurent Destailleur
3d01d77427 New: Stock change on invoice validation support all warehouse into point 
of sale module
 2011-11-15 20:27:32 +01:00
Laurent Destailleur
0308ed1088 Look: Uniformize css 2011-11-14 18:37:04 +01:00
Laurent Destailleur
5dc660af46 Fix: Stock sign for credit note must be reverted 2011-11-14 17:47:45 +01:00
Laurent Destailleur
7f77391acb Ask warehouse even when going back to draft 2011-11-14 16:57:26 +01:00
Laurent Destailleur
12963265d7 Add confirm message when going back to draft 2011-11-14 16:23:59 +01:00
Laurent Destailleur
7384096d56 Enhance doc for stock movement 2011-11-14 15:46:44 +01:00
Laurent Destailleur
8cdbc2151c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2011-11-14 01:38:33 +01:00
Laurent Destailleur
40a4bcec04 Qual: doxygen 
Fix: Preselected field was not selected
 2011-11-13 00:49:40 +01:00
Laurent Destailleur
9a43c8a14f Qual: Removed useless parameter 2011-11-12 12:59:06 +01:00
Regis Houssin
87d7badd53 Works on merge pdf with encryption 2011-11-12 09:23:54 +01:00
Regis Houssin
a7a85ac513 Fix: uniform code 2011-11-11 16:10:50 +01:00
Laurent Destailleur
10961fb2c9 New: Can choose warehouse for stock change on supplier approbation or 
supplier invoice validation
 2011-11-09 22:10:58 +01:00
Laurent Destailleur
253084feb3 New: Can choose warehouse for invoice validation 2011-11-09 14:31:43 +01:00
Laurent Destailleur
72c0a15f56 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/fiche.php
 2011-11-09 12:17:29 +01:00
Regis Houssin
cbec43e098 Fix: change 'editfieldkey' and 'editfieldval' for compatibility with 
external module and hook system.
Fix: uniform code
 2011-11-09 06:14:42 +08:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
cdacf73743 Fix: [ bug #228 ] Facture depuis commande remisée 2011-11-08 00:48:26 +01:00
Laurent Destailleur
824db25a74 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/class/commonobject.class.php
 2011-11-08 00:17:20 +01:00
Laurent Destailleur
3d0c324f5f Fix: Message for stock movement was wrong or missing 2011-11-08 00:03:19 +01:00
Regis Houssin
dea5ec5e26 Fix: reorder problem with external module 2011-11-07 22:32:22 +08:00
Regis Houssin
f1426c80d4 Fix: entity filter 2011-11-07 09:41:41 +01:00
Laurent Destailleur
8193e8a54e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-06 15:45:03 +01:00
Regis Houssin
ca63f3d8e9 Fix: uniform code and reindent 2011-11-06 11:11:43 +01:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Laurent Destailleur
c9b7bdf22f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/compta/deplacement/fiche.php
 2011-11-05 21:47:41 +01:00
Laurent Destailleur
06c5f3427c New: There is now two "inline edit" solution: Solution 1 use jquery 
and is enabled if MAIN_USE_JQUERY_JEDITABLE is on. Solution 2 use a link
"edit field" on resubmit page for eache field (this is by default). And
we are ready to add more.
New: Add also option MAIN_EDIT_ALSO_INLINE. Goal of this option is to
say: Even if this field can be edited by a global edit form, we allow
field to be edited with the "inline edit" feature (whatever is the
inline edit solution active). This option is to keep the standard
behaviour "We must click a "modify" button to allow to edit globally all
fields at once working and have only this way. If option is on, we can
also use the inlinde edit. If off, inline edit is available only for
fields not included into a global "modify" form.
line
 2011-11-05 21:24:55 +01:00
Regis Houssin
fd49fc97c8 Fix: bad function name 2011-11-05 19:44:48 +01:00
Laurent Destailleur
2b9285384c Merge editfield and editInPlace 2011-11-05 18:25:04 +01:00
Laurent Destailleur
cf365593dc Qual: Revert parameter order (optionnal at end) 2011-11-05 15:43:07 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +01:00
Laurent Destailleur
2996ee7639 New: Add trigger ACTION_DELETE and ACTION_MODIFY 
Fix: LOG_ERROR must be LOG_ERR
 2011-11-01 13:22:39 +01:00
Regis Houssin
dfcc0cff0c Fix: security 2011-10-31 18:52:25 +01:00
Regis Houssin
d9eb4cbeb9 New: add edit in place with ckeditor 
Fix: remove unused jQuery plugin ckeip
 2011-10-31 16:57:10 +01:00
Regis Houssin
419eb248c1 Fix: add generic edit in place select input 2011-10-31 14:34:11 +01:00
Laurent Destailleur
410efe0427 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2011-10-30 23:46:58 +01:00
Regis Houssin
d055e1c0a3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-10-30 09:07:37 +01:00
Juanjo Menent
5c9ba8a548 [task 189] Move Error* key from other.lang into errors.lang files 2011-10-29 23:52:05 +02:00
Regis Houssin
8dc1a20466 Add jeditable select and autocomplete (not stable) 2011-10-29 23:42:24 +02:00
Laurent Destailleur
784f696c85 Qual: Some fixes to make working with PHP option error_reporting 
E_STRICT
 2011-10-29 19:50:25 +02:00
Regis Houssin
5d23da1be1 Fix: uniform code 2011-10-29 08:33:59 +02:00
Laurent Destailleur
ba2c791af5 Fix: Filter on third party 2011-10-28 23:59:16 +02:00