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

59845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ea6daeb58b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-20 23:53:54 +01:00
Laurent Destailleur
1b0b4c9609 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-20 23:53:47 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
80f7bce8d8 Fix duplicate <a> 2017-03-20 20:41:43 +01:00
Laurent Destailleur
47e325cc66 NEW Can set the default value of any field on any create page with 
option MAIN_DEFAULT_FOR_path-to-file_fieldname
 2017-03-20 20:35:24 +01:00
Laurent Destailleur
db35db127c Do not allow to migrate n+2 before n+1 2017-03-20 19:21:26 +01:00
Alexandre SPANGARO
6d5578a876 Reactivated constant BANK_DISABLE_DIRECT_INPUT 2017-03-19 20:47:30 +01:00
Laurent Destailleur
ac19aba07e FIX multicurrency management on supplier order/invoice 
Conflicts:
	htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
 2017-03-19 15:41:55 +01:00
Laurent Destailleur
b7442a0c1a Fix bad vat rate used into sql request 2017-03-19 15:38:07 +01:00
Laurent Destailleur
e85206dee5 FIX multicurrency management on supplier order/invoice 2017-03-19 15:37:07 +01:00
Alexandre SPANGARO
b09398a68e Update works 2017-03-19 15:23:35 +01:00
Laurent Destailleur
75d73b188c Fix bad vat rate used into sql request 2017-03-19 14:51:25 +01:00
Laurent Destailleur
b169f93abc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-19 14:27:12 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
36f279837f Update work 2017-03-19 08:17:32 +01:00
Alexandre SPANGARO
e07f934185 Class is missing 2017-03-19 07:26:37 +01:00
Alexandre SPANGARO
504e1e1ec8 Step 3: Work on card 2017-03-19 07:26:15 +01:00
Alexandre SPANGARO
0e910616b6 Update table 2017-03-19 07:25:19 +01:00
Laurent Destailleur
967f3f579d Fix translation 2017-03-18 20:07:37 +01:00
Laurent Destailleur
49624c7b68 Useless bottom-border 2017-03-18 19:57:33 +01:00
Laurent Destailleur
b9d6122c53 Add comments 2017-03-18 19:56:53 +01:00
Laurent Destailleur
5871d59db9 Fix error "Invalid default value for 'date_price'" 2017-03-18 15:25:49 +01:00
De Coninck Laurent
a05ebb6c65 add 'fusion pdf' in mass action of expense report 
Add a mass action 'fusion pdf (build doc)' in expense report list
 2017-03-18 11:51:45 +01:00
Laurent Destailleur
f7e71d1de2 FIX LOG_ERROR does not exists. Use LOG_ERR. 2017-03-18 11:48:02 +01:00
Laurent Destailleur
f0dddae6d1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-18 11:38:32 +01:00
Laurent Destailleur
597fb11d08 Fix error management in duplicate trigger 2017-03-18 11:36:48 +01:00
Alexandre SPANGARO
8328c04624 2nd step : Add table 2017-03-18 08:12:29 +01:00
Alexandre SPANGARO
16b12b33fc First step : remove BANK_DISABLE_DIRECT_INPUT 2017-03-18 07:24:55 +01:00
Laurent Destailleur
4d6b20b785 Merge pull request #6540 from laudeco/fix/mailMassAction 
fix the from e-mail on mass action
 2017-03-18 04:34:37 +01:00
Laurent Destailleur
1e3c287eee Merge pull request #6539 from simnandez/5.0 
FIX #6537 Bug: SQL error: Missing , leads to wrong syntax
 2017-03-18 04:33:14 +01:00
Laurent Destailleur
9e545e9628 Merge pull request #6538 from hregis/4.0_bug3 
FIX wrong user fetch when same login in different entity
 2017-03-18 03:55:20 +01:00
Laurent Destailleur
42898cd4cc Merge pull request #6530 from defrance/patch-90 
Add fin_validite, date_cloture in fetch
 2017-03-18 03:53:34 +01:00
Laurent Destailleur
ee23e8b3d1 Merge pull request #6532 from fappels/5.0_fix_fourn_commande_class 
Fix fourn commande class
 2017-03-18 03:19:50 +01:00
Laurent Destailleur
7662ddc2fc Merge pull request #6529 from dolibarr95/patch-4 
NEW : Create a trigger for company create RIB
 2017-03-18 03:18:31 +01:00
De Coninck Laurent
8c65c47b1f fix the from e-mail on mass action 
In mass action e-mail (like on facture), the from e-mail was not taken into account.
 2017-03-17 17:55:25 +01:00
Juanjo Menent
5c028b30d5 Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form 2017-03-17 17:05:59 +01:00
Juanjo Menent
f255b94e99 Fix #6537 Bug: SQL error: Missing , leads to wrong syntax 2017-03-17 16:10:40 +01:00
Regis Houssin
f03bdb91a4 Merge remote-tracking branch 'origin/4.0' into 4.0_bug3 2017-03-17 12:42:54 +01:00
Regis Houssin
9e944e4525 Fix: wrong user fetch when same login in different entity 2017-03-17 12:41:56 +01:00
Laurent Destailleur
dfc1ed7d72 FIX #6535 2017-03-16 22:49:02 +01:00
Laurent Destailleur
7dd0f14563 Fix link to reconciliated function 2017-03-16 21:03:35 +01:00
Laurent Destailleur
68d3a93027 Fix link to reconcile 2017-03-16 20:36:51 +01:00
Laurent Destailleur
35b79818b7 Uniformize css rules 2017-03-16 20:33:51 +01:00
Laurent Destailleur
dba6d99686 Minor look enhancement 2017-03-16 17:02:30 +01:00
Laurent Destailleur
0d6a99b35a Fix space 2017-03-16 11:01:35 +01:00
Laurent Destailleur
68e50d0c79 FIX Filter on date lost after submit on time spent page 2017-03-16 10:36:17 +01:00
fappels
c1b21db407 Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0_fix_fourn_commande_class 2017-03-16 10:06:20 +01:00
fappels
f9c2bb0410 Fix create supplier order line label 
Fix create line label
Fix read line rang, special_code and fk_parent_line
Remove create line rang, done by table default and $this->rang is
invalid, supplier order has no rang property.
 2017-03-16 10:05:50 +01:00
BENKE Charlie
4e1799b2be Add fin_validite, date_cloture in fetch 2017-03-15 21:31:44 +01:00
Laurent Destailleur
deb91ad7c1 FIX Data lost during merge of thirdparties 2017-03-15 13:30:30 +01:00